diff --git a/Squirrel.sln b/Squirrel.sln index b5edbe08a..db7c84a31 100644 --- a/Squirrel.sln +++ b/Squirrel.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio 2012 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel", "src\Squirrel\Squirrel.csproj", "{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}" @@ -66,6 +66,30 @@ Global {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Release|Any CPU.Build.0 = Release|Any CPU {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Any CPU.ActiveCfg = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Any CPU.Build.0 = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Mixed Platforms.ActiveCfg = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Mixed Platforms.Build.0 = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Any CPU.ActiveCfg = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Any CPU.Build.0 = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Mixed Platforms.Build.0 = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Any CPU.ActiveCfg = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Any CPU.Build.0 = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Mixed Platforms.Build.0 = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Any CPU.Build.0 = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Mixed Platforms.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 @@ -114,30 +138,6 @@ Global {C1D40624-A484-438A-B846-052F321C89D1}.Release|Any CPU.Build.0 = Release|Win32 {C1D40624-A484-438A-B846-052F321C89D1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {C1D40624-A484-438A-B846-052F321C89D1}.Release|Mixed Platforms.Build.0 = Release|Win32 - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Any CPU.ActiveCfg = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Any CPU.Build.0 = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Mixed Platforms.ActiveCfg = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.CIBuild|Mixed Platforms.Build.0 = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Any CPU.ActiveCfg = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Any CPU.Build.0 = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Coverage|Mixed Platforms.Build.0 = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Any CPU.ActiveCfg = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Any CPU.Build.0 = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Mono Release|Mixed Platforms.Build.0 = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Any CPU.Build.0 = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1EEBACBC-6982-4696-BD4E-899ED0AC6CD2}.Release|Mixed Platforms.Build.0 = Release|Any CPU {EB521191-1EBF-4D06-8541-ED192E2EE378}.CIBuild|Any CPU.ActiveCfg = Release|Any CPU {EB521191-1EBF-4D06-8541-ED192E2EE378}.CIBuild|Any CPU.Build.0 = Release|Any CPU {EB521191-1EBF-4D06-8541-ED192E2EE378}.CIBuild|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -187,6 +187,8 @@ Global {F879F274-EFA0-4157-8404-33A19B4E6AEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {F879F274-EFA0-4157-8404-33A19B4E6AEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(NestedProjects) = preSolution + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj index b7829094e..7b41d9071 100644 --- a/src/Setup/Setup.vcxproj +++ b/src/Setup/Setup.vcxproj @@ -1,5 +1,5 @@  - + CIBuild @@ -18,6 +18,8 @@ {C1D40624-A484-438A-B846-052F321C89D1} Win32Proj Setup + Debug + Win32 @@ -25,6 +27,11 @@ true v120 Unicode + .\ + true + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)obj\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)/wtl90 Application @@ -32,6 +39,11 @@ v120_xp true Unicode + .\ + false + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)/wtl90 + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)obj\$(Configuration)\ Application @@ -39,6 +51,12 @@ v120 true Unicode + .\ + false + C:\WinDDK\7600.16385.1\inc\atl71;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)/wtl90 + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)obj\$(Configuration)\ + C:\WinDDK\7600.16385.1\lib\ATL\i386;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) @@ -53,25 +71,6 @@ - - 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)\ - - - false - C:\WinDDK\7600.16385.1\inc\atl71;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)/wtl90 - $(ProjectDir)bin\$(Configuration)\ - $(ProjectDir)obj\$(Configuration)\ - C:\WinDDK\7600.16385.1\lib\ATL\i386;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - Use diff --git a/src/Squirrel/ShellFile.cs b/src/Squirrel/ShellFile.cs index ccae21968..85a4b9a01 100644 --- a/src/Squirrel/ShellFile.cs +++ b/src/Squirrel/ShellFile.cs @@ -864,7 +864,9 @@ public short HotKey public void SetAppUserModelId(string appId) { var propStore = (IPropertyStore)linkW; - propStore.SetValue(PROPERTYKEY.PKEY_AppUserModel_ID, PropVariant.FromString(appId)); + var pkey = PROPERTYKEY.PKEY_AppUserModel_ID; + var str = PropVariant.FromString (appId); + propStore.SetValue(ref pkey, ref str); } /// diff --git a/src/Squirrel/Squirrel.csproj b/src/Squirrel/Squirrel.csproj index ed2631ca3..90a2456b3 100644 --- a/src/Squirrel/Squirrel.csproj +++ b/src/Squirrel/Squirrel.csproj @@ -1,5 +1,5 @@  - + Debug @@ -39,6 +39,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + 4 @@ -53,14 +54,6 @@ ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - @@ -70,6 +63,12 @@ + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + @@ -107,7 +106,7 @@ - {f879f274-efa0-4157-8404-33a19b4e6aec} + {F879F274-EFA0-4157-8404-33A19B4E6AEC} Core diff --git a/src/Squirrel/TrayHelper.cs b/src/Squirrel/TrayHelper.cs index 23806443c..a4ed07cf5 100644 --- a/src/Squirrel/TrayHelper.cs +++ b/src/Squirrel/TrayHelper.cs @@ -52,12 +52,13 @@ public void PromoteTrayItem(string exeToPromote) if (item.preference != NOTIFYITEM_PREFERENCE.PREFERENCE_SHOW_WHEN_ACTIVE) continue; item.preference = NOTIFYITEM_PREFERENCE.PREFERENCE_SHOW_ALWAYS; + var writable = NOTIFYITEM_Writable.fromNotifyItem(item); if (legacy) { var notifier = (ITrayNotifyWin7)instance; - notifier.SetPreference(NOTIFYITEM_Writable.fromNotifyItem(item)); + notifier.SetPreference(ref writable); } else { var notifier = (ITrayNotify)instance; - notifier.SetPreference(NOTIFYITEM_Writable.fromNotifyItem(item)); + notifier.SetPreference(ref writable); } } } catch (Exception ex) { diff --git a/src/Squirrel/Utility.cs b/src/Squirrel/Utility.cs index 84137571a..5dcd87005 100644 --- a/src/Squirrel/Utility.cs +++ b/src/Squirrel/Utility.cs @@ -180,6 +180,7 @@ public static T Retry(this Func block, int retries = 2) public static Task> InvokeProcessAsync(string fileName, string arguments, CancellationToken ct) { var psi = new ProcessStartInfo(fileName, arguments); + psi.UseShellExecute = false; psi.WindowStyle = ProcessWindowStyle.Hidden; psi.ErrorDialog = false; diff --git a/src/SyncReleases/SyncReleases.csproj b/src/SyncReleases/SyncReleases.csproj index 3f3b30bfb..288f07557 100644 --- a/src/SyncReleases/SyncReleases.csproj +++ b/src/SyncReleases/SyncReleases.csproj @@ -1,5 +1,5 @@  - + Debug @@ -30,23 +30,15 @@ TRACE prompt 4 + cd "$(TargetDir)" +"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) ICSharpCode.SharpZipLib.dll Microsoft.Web.XmlTransform.dll Splat.dll Squirrel.dll Octokit.dll NuGet.Squirrel.dll +del "$(TargetFileName)" +ren "$(TargetFileName).tmp" "$(TargetFileName)" - - False - ..\..\ext\ICSharpCode.SharpZipLib.dll - ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - ..\..\packages\Octokit.0.10.0\lib\net45\Octokit.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - @@ -55,6 +47,15 @@ + + ..\..\ext\ICSharpCode.SharpZipLib.dll + + + ..\..\packages\Octokit.0.10.0\lib\net45\Octokit.dll + + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + @@ -71,19 +72,13 @@ - {f879f274-efa0-4157-8404-33a19b4e6aec} + {F879F274-EFA0-4157-8404-33A19B4E6AEC} Core - {1436e22a-fe3c-4d68-9a85-9e74df2e6a92} + {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92} Squirrel - - cd "$(TargetDir)" -"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) ICSharpCode.SharpZipLib.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/Update/AnimatedGifWindow.cs b/src/Update/AnimatedGifWindow.cs index d30566ee6..ee718ea96 100644 --- a/src/Update/AnimatedGifWindow.cs +++ b/src/Update/AnimatedGifWindow.cs @@ -1,4 +1,5 @@ -using System; +#if !MONO +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -90,3 +91,5 @@ public static void ShowWindow(TimeSpan initialDelay, CancellationToken token, Pr } } } + +#endif \ No newline at end of file diff --git a/src/Update/Program.cs b/src/Update/Program.cs index eb6d0dbc6..05dfd737c 100644 --- a/src/Update/Program.cs +++ b/src/Update/Program.cs @@ -16,7 +16,7 @@ using Squirrel.Json; using System.Drawing; using System.Windows; -using System.Windows.Shell; +//using System.Windows.Shell; using NuGet; namespace Squirrel.Update @@ -141,6 +141,7 @@ int executeCommandLine(string[] args) } switch (updateAction) { +#if !MONO case UpdateAction.Install: var progressSource = new ProgressSource(); if (!silentInstall) { @@ -162,9 +163,6 @@ int executeCommandLine(string[] args) case UpdateAction.UpdateSelf: UpdateSelf().Wait(); break; - case UpdateAction.Releasify: - Releasify(target, releaseDir, packagesDir, bootstrapperExe, backgroundGif, signingParameters, baseUrl, setupIcon, !noMsi); - break; case UpdateAction.Shortcut: Shortcut(target, shortcutArgs, processStartArgs, setupIcon); break; @@ -174,6 +172,10 @@ int executeCommandLine(string[] args) case UpdateAction.ProcessStart: ProcessStart(processStart, processStartArgs, shouldWait); break; +#endif + case UpdateAction.Releasify: + Releasify(target, releaseDir, packagesDir, bootstrapperExe, backgroundGif, signingParameters, baseUrl, setupIcon, !noMsi); + break; } } @@ -742,6 +744,7 @@ static string getAppNameFromDirectory(string path = null) static int consoleCreated = 0; static void ensureConsole() { +#if !MONO if (Interlocked.CompareExchange(ref consoleCreated, 1, 0) == 1) return; if (!NativeMethods.AttachConsole(-1)) { @@ -750,6 +753,7 @@ static void ensureConsole() NativeMethods.GetStdHandle(StandardHandles.STD_ERROR_HANDLE); NativeMethods.GetStdHandle(StandardHandles.STD_OUTPUT_HANDLE); +#endif } } diff --git a/src/Update/Update.csproj b/src/Update/Update.csproj index b101a8f74..982987e8a 100644 --- a/src/Update/Update.csproj +++ b/src/Update/Update.csproj @@ -1,5 +1,5 @@  - + Debug @@ -30,9 +30,13 @@ TRACE prompt 4 + cd "$(TargetDir)" +"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) WpfAnimatedGif.dll ICSharpCode.SharpZipLib.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)" - - + + $(DefineConstants);MONO app.manifest @@ -52,10 +56,6 @@ - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - @@ -68,9 +68,11 @@ - + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + + ..\..\packages\WpfAnimatedGif.1.4.12\lib\net\WpfAnimatedGif.dll - True @@ -94,11 +96,11 @@ - {f879f274-efa0-4157-8404-33a19b4e6aec} + {F879F274-EFA0-4157-8404-33A19B4E6AEC} Core - {1436e22a-fe3c-4d68-9a85-9e74df2e6a92} + {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92} Squirrel @@ -117,12 +119,6 @@ - - cd "$(TargetDir)" -"$(SolutionDir)packages\ILRepack.1.26.0\tools\ILRepack.exe" /internalize /out:$(TargetFileName).tmp $(TargetFileName) WpfAnimatedGif.dll ICSharpCode.SharpZipLib.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/test/Squirrel.Tests.csproj b/test/Squirrel.Tests.csproj index 8a3aa5912..86f417aa8 100644 --- a/test/Squirrel.Tests.csproj +++ b/test/Squirrel.Tests.csproj @@ -1,5 +1,5 @@  - + @@ -40,6 +40,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + 4 @@ -57,10 +58,6 @@ ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - ..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - @@ -68,22 +65,20 @@ - + + ..\packages\Splat.1.6.2\lib\Net45\Splat.dll + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - True - + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - True - - False + ..\packages\xunit.runner.utility.2.0.0\lib\net35\xunit.runner.utility.desktop.dll - True @@ -110,11 +105,11 @@ - {1436e22a-fe3c-4d68-9a85-9e74df2e6a92} + {1436E22A-FE3C-4D68-9A85-9E74DF2E6A92} Squirrel - {f879f274-efa0-4157-8404-33a19b4e6aec} + {F879F274-EFA0-4157-8404-33A19B4E6AEC} Core