diff --git a/.nuget/packages.config b/.nuget/packages.config
deleted file mode 100644
index 4846ac3c..00000000
--- a/.nuget/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/Squirrel.sln b/Squirrel.sln
index dd0d8df3..68726b05 100644
--- a/Squirrel.sln
+++ b/Squirrel.sln
@@ -1,26 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel", "src\Squirrel\Squirrel.csproj", "{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squirrel", "src\Squirrel\Squirrel.csproj", "{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel.Tests", "test\Squirrel.Tests.csproj", "{98AEB048-E27D-42F4-9440-505B7F78BAFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squirrel.Tests", "test\Squirrel.Tests.csproj", "{98AEB048-E27D-42F4-9440-505B7F78BAFD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Setup", "src\Setup\Setup.vcxproj", "{C1D40624-A484-438A-B846-052F321C89D1}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{50DF07EF-7C73-4031-8DD6-E3AE0D188371}"
- ProjectSection(SolutionItems) = preProject
- .nuget\packages.config = .nuget\packages.config
- EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Update", "src\Update\Update.csproj", "{1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Update", "src\Update\Update.csproj", "{1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyncReleases", "src\SyncReleases\SyncReleases.csproj", "{EB521191-1EBF-4D06-8541-ED192E2EE378}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SyncReleases", "src\SyncReleases\SyncReleases.csproj", "{EB521191-1EBF-4D06-8541-ED192E2EE378}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLevel", "{ED657D2C-F8A0-4012-A64F-7367D41BE4D2}"
ProjectSection(SolutionItems) = preProject
- src\SolutionAssemblyInfo.cs = src\SolutionAssemblyInfo.cs
src\Squirrel.nuspec = src\Squirrel.nuspec
vendor\wix\template.wxs = vendor\wix\template.wxs
EndProjectSection
@@ -29,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "vendor\nuget\src\Co
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WriteZipToSetup", "src\WriteZipToSetup\WriteZipToSetup.vcxproj", "{4D3C8B70-075D-48A5-9FF3-EDB87347B136}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Update-Mono", "src\Update\Update-Mono.csproj", "{5B4BC824-73FC-49D7-BD9D-CE53AA1AA86E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Update-Mono", "src\Update\Update-Mono.csproj", "{5B4BC824-73FC-49D7-BD9D-CE53AA1AA86E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StubExecutable", "src\StubExecutable\StubExecutable.vcxproj", "{C028DB2A-E7C5-4232-8C22-D5FBA2176136}"
EndProject
@@ -61,22 +55,22 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Any CPU.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Any CPU.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Mixed Platforms.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Mixed Platforms.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x64.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x64.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x86.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x86.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Any CPU.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Any CPU.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Mixed Platforms.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Mixed Platforms.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x64.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x64.Build.0 = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x86.ActiveCfg = CIBuild|Any CPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x86.Build.0 = CIBuild|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Any CPU.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Any CPU.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|Mixed Platforms.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x64.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x64.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x86.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.CIBuild|x86.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Any CPU.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|Mixed Platforms.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x64.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x64.Build.0 = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x86.ActiveCfg = Release|Any CPU
+ {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Coverage|x86.Build.0 = Release|Any CPU
{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -109,22 +103,22 @@ Global
{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Release|x64.Build.0 = Release|Any CPU
{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Release|x86.ActiveCfg = Release|Any CPU
{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Release|x86.Build.0 = Release|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Any CPU.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Any CPU.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Mixed Platforms.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Mixed Platforms.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x64.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x64.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x86.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x86.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Any CPU.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Any CPU.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Mixed Platforms.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Mixed Platforms.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x64.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x64.Build.0 = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x86.ActiveCfg = CIBuild|Any CPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x86.Build.0 = CIBuild|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Any CPU.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Any CPU.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|Mixed Platforms.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x64.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x64.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x86.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.CIBuild|x86.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Any CPU.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|Mixed Platforms.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x64.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x64.Build.0 = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x86.ActiveCfg = Release|Any CPU
+ {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Coverage|x86.Build.0 = Release|Any CPU
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -157,21 +151,22 @@ Global
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Release|x64.Build.0 = Release|Any CPU
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Release|x86.ActiveCfg = Release|Any CPU
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Release|x86.Build.0 = Release|Any CPU
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Any CPU.ActiveCfg = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Any CPU.Build.0 = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Mixed Platforms.ActiveCfg = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Mixed Platforms.Build.0 = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x64.ActiveCfg = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x86.ActiveCfg = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x86.Build.0 = CIBuild|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Any CPU.ActiveCfg = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Any CPU.Build.0 = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Mixed Platforms.ActiveCfg = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Mixed Platforms.Build.0 = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x64.ActiveCfg = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x64.Build.0 = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x86.ActiveCfg = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|x86.Build.0 = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Coverage|Any CPU.ActiveCfg = Release|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Coverage|Any CPU.Build.0 = Release|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|Mixed Platforms.ActiveCfg = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|Mixed Platforms.Build.0 = CIBuild|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|Mixed Platforms.ActiveCfg = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|Mixed Platforms.Build.0 = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Coverage|x64.ActiveCfg = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Coverage|x64.Build.0 = Debug|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|x86.ActiveCfg = CIBuild|Win32
- {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|x86.Build.0 = CIBuild|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|x86.ActiveCfg = Debug|Win32
+ {C1D40624-A484-438A-B846-052F321C89D1}.Coverage|x86.Build.0 = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Debug|Any CPU.ActiveCfg = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Debug|Any CPU.Build.0 = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -492,6 +487,9 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {68CA987A-9BAB-4C75-8EEB-4596BA6BBD07}
+ EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
$0.TextStylePolicy = $1
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 00000000..9f2f3bf3
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,28 @@
+
+
+
+ Debug
+ false
+
+ $(MSBuildProjectName)
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))
+ $(BaseOutputPath)obj\$(ProjectName)\
+ $(BaseOutputPath)$(Configuration)\
+
+ GitHub
+ Copyright © GitHub 2013-2015
+ MS-RL
+ Squirrel
+
+
+
+
+
+
+
+
+ Win32
+ $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\
+ $(OutputPath)$(Platform)\
+
+
diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj
index 70050010..5b3ebdc6 100644
--- a/src/Setup/Setup.vcxproj
+++ b/src/Setup/Setup.vcxproj
@@ -1,10 +1,6 @@
-
- CIBuild
- Win32
-
Debug
Win32
@@ -16,30 +12,20 @@
{C1D40624-A484-438A-B846-052F321C89D1}
+ Application
Win32Proj
+ v141
+ Unicode
Setup
- Application
true
- v141
- Unicode
Static
- Application
false
- v141
true
- Unicode
-
-
- Application
- false
- v141
- true
- Unicode
@@ -50,29 +36,22 @@
-
-
-
true
- $(ProjectDir)bin\$(Configuration)\
- $(ProjectDir)obj\$(Configuration)\
$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)/wtl90
false
$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)/wtl90
- $(ProjectDir)bin\$(Configuration)\
- $(ProjectDir)obj\$(Configuration)\
-
+
Use
@@ -121,32 +100,6 @@
true
-
-
- Level3
- Use
- MinSpace
- true
- true
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- Size
- true
- MultiThreaded
-
-
- Windows
- true
- true
- true
- AsInvoker
- kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;urlmon.lib
- user32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;urlmon.dll;%(DelayLoadDLLs)
-
-
- compat.manifest
-
-
@@ -164,9 +117,7 @@
- Create
- Create
- Create
+ Create
diff --git a/src/SolutionAssemblyInfo.cs b/src/SolutionAssemblyInfo.cs
deleted file mode 100644
index 40a3cd44..00000000
--- a/src/SolutionAssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma warning disable 1699 // 1699 = Use command line option '/keyfile' or appropriate project settings instead of 'AssemblyKeyFile'
-
-using System.Reflection;
-using System.Resources;
-
-// Shared assembly info that is common for all assemblies of this project
-
-////[assembly: AssemblyTitle("DEFINED IN ACTUAL ASSEMBLYINFO")]
-////[assembly: AssemblyProduct("DEFINED IN ACTUAL ASSEMBLYINFO")]
-////[assembly: AssemblyDescription("DEFINED IN ACTUAL ASSEMBLYINFO")]
-
-[assembly: AssemblyCompany("GitHub")]
-[assembly: AssemblyCopyright("Copyright © GitHub 2013-2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.9.1")]
\ No newline at end of file
diff --git a/src/Squirrel/Properties/AssemblyInfo.cs b/src/Squirrel/Properties/AssemblyInfo.cs
index cec2385f..467277cd 100644
--- a/src/Squirrel/Properties/AssemblyInfo.cs
+++ b/src/Squirrel/Properties/AssemblyInfo.cs
@@ -2,21 +2,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-// All other assembly info is defined in SharedAssembly.cs
-
-[assembly: AssemblyTitle("Squirrel")]
-[assembly: AssemblyProduct("Squirrel")]
-[assembly: AssemblyDescription("Squirrel")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3c25a7f9-3e99-4556-aba3-f820c74bb4da")]
-
[assembly: InternalsVisibleTo("Squirrel.Tests")]
[assembly: InternalsVisibleTo("Update")]
[assembly: InternalsVisibleTo("Update-Mono")]
diff --git a/src/Squirrel/Squirrel.csproj b/src/Squirrel/Squirrel.csproj
index 9769199e..94bbb4f8 100644
--- a/src/Squirrel/Squirrel.csproj
+++ b/src/Squirrel/Squirrel.csproj
@@ -1,127 +1,29 @@
-
-
+
+
- Debug
- AnyCPU
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}
- Library
- Properties
- Squirrel
- Squirrel
- v4.5
- 512
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
+ net45
+ Squirrel
+ Squirrel
true
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- true
-
-
- bin\CIBuild\
- TRACE
- true
- pdbonly
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
- 4
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- ..\..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll
- True
-
-
- ..\..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll
- True
-
-
- ..\..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll
- True
-
-
- ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll
-
-
- ..\..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
-
-
-
-
-
-
-
-
-
-
- ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll
-
-
- ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
-
+
+
-
-
- Properties\SolutionAssemblyInfo.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {F879F274-EFA0-4157-8404-33A19B4E6AEC}
- Core
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/src/Squirrel/Utility.cs b/src/Squirrel/Utility.cs
index 5e683d42..28306080 100644
--- a/src/Squirrel/Utility.cs
+++ b/src/Squirrel/Utility.cs
@@ -358,7 +358,7 @@ namespace Squirrel
if (ModeDetector.InUnitTestRunner()) {
var vendorDir = Path.Combine(
Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", "")),
- "..", "..", "..",
+ "..", "..", "..", "..",
"vendor", "7zip"
);
return FindHelperExecutable("7z.exe", new[] { vendorDir });
diff --git a/src/Squirrel/packages.config b/src/Squirrel/packages.config
deleted file mode 100644
index a01302a7..00000000
--- a/src/Squirrel/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/StubExecutable/ReadMe.txt b/src/StubExecutable/ReadMe.txt
deleted file mode 100644
index d2e1a19e..00000000
--- a/src/StubExecutable/ReadMe.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-========================================================================
- WIN32 APPLICATION : StubExecutable Project Overview
-========================================================================
-
-AppWizard has created this StubExecutable application for you.
-
-This file contains a summary of what you will find in each of the files that
-make up your StubExecutable application.
-
-
-StubExecutable.vcxproj
- This is the main project file for VC++ projects generated using an Application Wizard.
- It contains information about the version of Visual C++ that generated the file, and
- information about the platforms, configurations, and project features selected with the
- Application Wizard.
-
-StubExecutable.vcxproj.filters
- This is the filters file for VC++ projects generated using an Application Wizard.
- It contains information about the association between the files in your project
- and the filters. This association is used in the IDE to show grouping of files with
- similar extensions under a specific node (for e.g. ".cpp" files are associated with the
- "Source Files" filter).
-
-StubExecutable.cpp
- This is the main application source file.
-
-/////////////////////////////////////////////////////////////////////////////
-AppWizard has created the following resources:
-
-StubExecutable.rc
- This is a listing of all of the Microsoft Windows resources that the
- program uses. It includes the icons, bitmaps, and cursors that are stored
- in the RES subdirectory. This file can be directly edited in Microsoft
- Visual C++.
-
-Resource.h
- This is the standard header file, which defines new resource IDs.
- Microsoft Visual C++ reads and updates this file.
-
-StubExecutable.ico
- This is an icon file, which is used as the application's icon (32x32).
- This icon is included by the main resource file StubExecutable.rc.
-
-small.ico
- This is an icon file, which contains a smaller version (16x16)
- of the application's icon. This icon is included by the main resource
- file StubExecutable.rc.
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
- These files are used to build a precompiled header (PCH) file
- named StubExecutable.pch and a precompiled types file named StdAfx.obj.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/StubExecutable/StubExecutable.vcxproj b/src/StubExecutable/StubExecutable.vcxproj
index 5ef4456d..f8b56f0e 100644
--- a/src/StubExecutable/StubExecutable.vcxproj
+++ b/src/StubExecutable/StubExecutable.vcxproj
@@ -20,36 +20,20 @@
{C028DB2A-E7C5-4232-8C22-D5FBA2176136}
+ Application
Win32Proj
StubExecutable
+ v141
+ Unicode
8.1
-
- Application
+
true
- v141
- Unicode
-
- Application
+
false
- v141
true
- Unicode
-
-
- Application
- true
- v141
- Unicode
-
-
- Application
- false
- v141
- true
- Unicode
@@ -71,18 +55,12 @@
true
- $(IncludePath)
- $(ProjectDir)\bin\$(Configuration)\
- $(ProjectDir)\obj\$(Configuration)\
true
false
- $(IncludePath)
- $(ProjectDir)\bin\$(Configuration)\
- $(ProjectDir)\obj\$(Configuration)\
false
@@ -145,9 +123,6 @@
true
-
-
-
@@ -155,15 +130,13 @@
+
- Create
- Create
- Create
- Create
+ Create
@@ -174,9 +147,6 @@
-
-
-
diff --git a/src/SyncReleases/Properties/AssemblyInfo.cs b/src/SyncReleases/Properties/AssemblyInfo.cs
deleted file mode 100644
index e937dd63..00000000
--- a/src/SyncReleases/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// All other assembly info is defined in SharedAssembly.cs
-
-[assembly: AssemblyTitle("SyncReleases")]
-[assembly: AssemblyProduct("SyncReleases")]
-[assembly: AssemblyDescription("SyncReleases")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9f6c5659-5606-4d1f-a482-bc2d5aefee5a")]
diff --git a/src/SyncReleases/SyncReleases.csproj b/src/SyncReleases/SyncReleases.csproj
index b389a5b3..e93e6599 100644
--- a/src/SyncReleases/SyncReleases.csproj
+++ b/src/SyncReleases/SyncReleases.csproj
@@ -1,88 +1,34 @@
-
-
+
+
+
- Debug
- AnyCPU
- {EB521191-1EBF-4D06-8541-ED192E2EE378}
+ net45
Exe
- Properties
- SyncReleases
- SyncReleases
- v4.5
- 512
+ SyncReleases
+ SyncReleases
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cd "$(TargetDir)"
+ "$(NuGetPackageRoot)ilrepack\1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) SharpCompress.dll Microsoft.Web.XmlTransform.dll Splat.dll Squirrel.dll Octokit.dll NuGet.Squirrel.dll
+ del "$(TargetFileName)"
+ ren "$(TargetFileName).tmp" "$(TargetFileName)"
+
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll
-
-
- ..\..\packages\Octokit.0.10.0\lib\net45\Octokit.dll
- True
-
-
- ..\..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
-
-
- ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
- Properties\SolutionAssemblyInfo.cs
-
-
-
-
-
-
-
-
-
-
-
-
- {f879f274-efa0-4157-8404-33a19b4e6aec}
- Core
-
-
- {1436e22a-fe3c-4d68-9a85-9e74df2e6a92}
- Squirrel
-
-
-
-
- cd "$(TargetDir)"
-"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) SharpCompress.dll Microsoft.Web.XmlTransform.dll Splat.dll Squirrel.dll Octokit.dll NuGet.Squirrel.dll
-del "$(TargetFileName)"
-ren "$(TargetFileName).tmp" "$(TargetFileName)"
-
-
\ No newline at end of file
+
diff --git a/src/SyncReleases/packages.config b/src/SyncReleases/packages.config
deleted file mode 100644
index 0fdefa41..00000000
--- a/src/SyncReleases/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Update/Properties/AssemblyInfo.cs b/src/Update/Properties/AssemblyInfo.cs
deleted file mode 100644
index efda0b8a..00000000
--- a/src/Update/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// All other assembly info is defined in SharedAssembly.cs
-
-[assembly: AssemblyTitle("Update")]
-[assembly: AssemblyProduct("Update")]
-[assembly: AssemblyDescription("Update")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a0663459-8b01-4fcd-96b8-c4235eb4dc51")]
diff --git a/src/Update/Update-Mono.csproj b/src/Update/Update-Mono.csproj
index f7330bc2..755bb81c 100644
--- a/src/Update/Update-Mono.csproj
+++ b/src/Update/Update-Mono.csproj
@@ -1,133 +1,44 @@
-
-
-
- Debug
- AnyCPU
- {5B4BC824-73FC-49D7-BD9D-CE53AA1AA86E}
- WinExe
- Properties
- Squirrel.Update
- Update-Mono
- v4.5
- 512
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE;MONO
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE;MONO
- prompt
- 4
-
-
-
-
+
+
+
+ net45
+ Exe
+ Update
+ Update
app.manifest
+ $(DefineConstants);MONO
+
-
- ..\..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll
- True
-
-
- ..\..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll
- True
-
-
- ..\..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll
- True
-
-
- ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll
-
-
-
-
- ..\..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
-
-
- ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
- Properties\SolutionAssemblyInfo.cs
-
-
-
-
-
-
+
+
+
-
-
-
-
- PreserveNewest
-
+
+
+
-
- {f879f274-efa0-4157-8404-33a19b4e6aec}
- Core
-
-
- {1436e22a-fe3c-4d68-9a85-9e74df2e6a92}
- Squirrel
-
+
-
-
- PreserveNewest
-
-
-
-
- PreserveNewest
-
-
-
-
-
-
+
+
+
+
+ cd "$(TargetDir)"
+ "$(NuGetPackageRoot)ilrepack\1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) Microsoft.Web.XmlTransform.dll Splat.dll DeltaCompressionDotNet.dll DeltaCompressionDotNet.MsDelta.dll Squirrel.dll NuGet.Squirrel.dll Mono.Cecil.dll SharpCompress.dll
+ del "$(TargetFileName)"
+ ren "$(TargetFileName).tmp" "$(TargetFileName)"
+
-
- cd "$(TargetDir)"
-"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) Microsoft.Web.XmlTransform.dll Splat.dll DeltaCompressionDotNet.dll DeltaCompressionDotNet.MsDelta.dll Squirrel.dll NuGet.Squirrel.dll Mono.Cecil.dll SharpCompress.dll
-del "$(TargetFileName)"
-ren "$(TargetFileName).tmp" "$(TargetFileName)"
-
-
-
\ No newline at end of file
+
+
diff --git a/src/Update/Update.csproj b/src/Update/Update.csproj
index b6293479..f4bf7c37 100644
--- a/src/Update/Update.csproj
+++ b/src/Update/Update.csproj
@@ -1,122 +1,43 @@
-
-
-
- Debug
- AnyCPU
- {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}
- WinExe
- Properties
- Squirrel.Update
- Update
- v4.5
- 512
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
+
+
+
+ net45
+ Exe
+ Update
+ Update
app.manifest
+
-
-
-
- ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\packages\WpfAnimatedGif.1.4.15\lib\net\WpfAnimatedGif.dll
-
+
+
+
+
-
- Properties\SolutionAssemblyInfo.cs
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
- PreserveNewest
-
+
+
+
-
- {f879f274-efa0-4157-8404-33a19b4e6aec}
- Core
-
-
- {1436e22a-fe3c-4d68-9a85-9e74df2e6a92}
- Squirrel
-
+
-
-
- PreserveNewest
-
-
-
-
- PreserveNewest
-
-
-
-
-
-
+
+
+
+
+ cd "$(TargetDir)"
+ "$(NuGetPackageRoot)ilrepack\1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) WpfAnimatedGif.dll SharpCompress.dll Microsoft.Web.XmlTransform.dll Splat.dll DeltaCompressionDotNet.dll DeltaCompressionDotNet.MsDelta.dll Squirrel.dll NuGet.Squirrel.dll Mono.Cecil.dll
+ del "$(TargetFileName)"
+ ren "$(TargetFileName).tmp" "$(TargetFileName)"
+
-
- cd "$(TargetDir)"
-"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) WpfAnimatedGif.dll SharpCompress.dll Microsoft.Web.XmlTransform.dll Splat.dll DeltaCompressionDotNet.dll DeltaCompressionDotNet.MsDelta.dll Squirrel.dll NuGet.Squirrel.dll Mono.Cecil.dll
-del "$(TargetFileName)"
-ren "$(TargetFileName).tmp" "$(TargetFileName)"
-
-
-
\ No newline at end of file
+
+
diff --git a/src/WriteZipToSetup/ReadMe.txt b/src/WriteZipToSetup/ReadMe.txt
deleted file mode 100644
index 60b3d5e1..00000000
--- a/src/WriteZipToSetup/ReadMe.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-========================================================================
- CONSOLE APPLICATION : WriteZipToSetup Project Overview
-========================================================================
-
-AppWizard has created this WriteZipToSetup application for you.
-
-This file contains a summary of what you will find in each of the files that
-make up your WriteZipToSetup application.
-
-
-WriteZipToSetup.vcxproj
- This is the main project file for VC++ projects generated using an Application Wizard.
- It contains information about the version of Visual C++ that generated the file, and
- information about the platforms, configurations, and project features selected with the
- Application Wizard.
-
-WriteZipToSetup.vcxproj.filters
- This is the filters file for VC++ projects generated using an Application Wizard.
- It contains information about the association between the files in your project
- and the filters. This association is used in the IDE to show grouping of files with
- similar extensions under a specific node (for e.g. ".cpp" files are associated with the
- "Source Files" filter).
-
-WriteZipToSetup.cpp
- This is the main application source file.
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
- These files are used to build a precompiled header (PCH) file
- named WriteZipToSetup.pch and a precompiled types file named StdAfx.obj.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/WriteZipToSetup/WriteZipToSetup.vcxproj b/src/WriteZipToSetup/WriteZipToSetup.vcxproj
index ef62c324..653236c2 100644
--- a/src/WriteZipToSetup/WriteZipToSetup.vcxproj
+++ b/src/WriteZipToSetup/WriteZipToSetup.vcxproj
@@ -12,27 +12,20 @@
{4D3C8B70-075D-48A5-9FF3-EDB87347B136}
+ Application
Win32Proj
WriteZipToSetup
+ v141
+ Unicode
8.1
- Application
true
- v141
- Unicode
- $(ProjectDir)bin\$(Configuration)\
- $(ProjectDir)obj\$(Configuration)\
- Application
false
- v141
true
- Unicode
- $(ProjectDir)bin\$(Configuration)\
- $(ProjectDir)obj\$(Configuration)\
@@ -83,16 +76,12 @@
true
-
-
-
- Create
- Create
+ Create
diff --git a/test/Properties/AssemblyInfo.cs b/test/Properties/AssemblyInfo.cs
index c587a606..568ac081 100644
--- a/test/Properties/AssemblyInfo.cs
+++ b/test/Properties/AssemblyInfo.cs
@@ -2,20 +2,6 @@
using System.Runtime.InteropServices;
using Xunit;
-// All other assembly info is defined in SharedAssembly.cs
-
-[assembly: AssemblyTitle("Squirrel.Tests")]
-[assembly: AssemblyProduct("Squirrel.Tests")]
-[assembly: AssemblyDescription("Squirrel.Tests")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f781bbe0-d19d-41aa-a78b-c689b1943094")]
-
[assembly: CollectionBehavior(MaxParallelThreads=1, DisableTestParallelization=true)]
[assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
\ No newline at end of file
diff --git a/test/Squirrel.Tests.csproj b/test/Squirrel.Tests.csproj
index 6c89f4fb..ae32d0c8 100644
--- a/test/Squirrel.Tests.csproj
+++ b/test/Squirrel.Tests.csproj
@@ -1,146 +1,25 @@
-
-
-
-
+
- Debug
- AnyCPU
- {98AEB048-E27D-42F4-9440-505B7F78BAFD}
- Library
- Properties
- Squirrel.Tests
- Squirrel.Tests
- v4.5
- 512
- c0014311
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- bin\CIBuild\
- TRACE
- true
- pdbonly
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
- 4
+ net45
+ Squirrel.Tests
+ Squirrel.Tests
+ false
+ true
+
+
+
+
+
+
-
- ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll
- True
-
-
- ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll
- True
-
-
- ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll
- True
-
-
- ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll
-
-
- ..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
-
-
-
-
-
-
-
-
- ..\packages\Splat.1.6.2\lib\Net45\Splat.dll
-
-
- ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
-
-
- ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll
-
-
- ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll
-
-
- ..\packages\xunit.runner.utility.2.0.0\lib\net35\xunit.runner.utility.desktop.dll
-
+
-
- Properties\SolutionAssemblyInfo.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
- {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}
- Squirrel
-
-
- {F879F274-EFA0-4157-8404-33A19B4E6AEC}
- Core
-
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
- "$(SolutionDir).nuget\NuGet.exe" pack "$(ProjectPath)" -OutputDirectory "$(ProjectDir)$(OutDir)." -Properties Configuration=$(Configuration)
-
-
- ECHO "$(SolutionDir).nuget\NuGet.exe" pack "$(ProjectPath)" -OutputDirectory "$(ProjectDir)$(OutDir)." -Properties Configuration=$(Configuration)
-
-
-
\ No newline at end of file
+
diff --git a/test/SquirrelAwareExecutableDetectorTests.cs b/test/SquirrelAwareExecutableDetectorTests.cs
index 43dea336..e29713b2 100644
--- a/test/SquirrelAwareExecutableDetectorTests.cs
+++ b/test/SquirrelAwareExecutableDetectorTests.cs
@@ -14,6 +14,14 @@ namespace Squirrel.Tests
{
public class SquirrelAwareExecutableDetectorTests
{
+#if DEBUG
+ private const string NativeBuildRootRelativePath = @"..\build\Debug\Win32\";
+ private const string ManagedBuildRootRelativePath = @"..\build\Debug\net45\";
+#else
+ private const string NativeBuildRootRelativePath = @"..\build\Release\Win32\";
+ private const string ManagedBuildRootRelativePath = @"..\build\Release\net45\";
+#endif
+
[Fact]
public void AtomShellShouldBeSquirrelAware()
{
@@ -26,10 +34,7 @@ namespace Squirrel.Tests
[Fact]
public void SquirrelAwareViaVersionBlock()
{
- var target = Path.Combine(
- IntegrationTestHelper.GetIntegrationTestRootDirectory(),
- "..", "src", "Setup", "bin", "Release", "Setup.exe");
-
+ var target = IntegrationTestHelper.GetPath(NativeBuildRootRelativePath, "Setup.exe");
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetPESquirrelAwareVersion(target);
@@ -50,7 +55,7 @@ namespace Squirrel.Tests
[Fact]
public void NotSquirrelAware()
{
- var target = IntegrationTestHelper.GetPath("..", "src", "Update", "bin", "Release", "Update.exe");
+ var target = IntegrationTestHelper.GetPath(ManagedBuildRootRelativePath, "Update.exe");
Assert.True(File.Exists(target));
var ret = SquirrelAwareExecutableDetector.GetPESquirrelAwareVersion(target);
diff --git a/test/packages.config b/test/packages.config
deleted file mode 100644
index c1698365..00000000
--- a/test/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/version.json b/version.json
new file mode 100644
index 00000000..0b53cb1b
--- /dev/null
+++ b/version.json
@@ -0,0 +1,11 @@
+{
+ "version": "1.9.2-preview.{height}",
+ "publicReleaseRefSpec": [
+ "^refs/heads/master$"
+ ],
+ "cloudBuild": {
+ "buildNumber": {
+ "enabled": true
+ }
+ }
+}