From 151b527717a00032acf9a27002449de1ababa57f Mon Sep 17 00:00:00 2001 From: gdziadkiewicz Date: Sun, 3 Dec 2017 17:38:20 +0100 Subject: [PATCH 1/2] Add bootstrap to resources. --- .paket/Paket.Restore.targets | 38 ++++++++++++++---- .../Paket.VisualStudio.csproj | 1 + src/Paket.VisualStudio/Resources.Designer.cs | 23 ++++++++--- src/Paket.VisualStudio/Resources.resx | 13 ++---- .../Resources/paket.bootstrapper.exe | Bin 0 -> 29232 bytes src/Paket.VisualStudio/Utils/PaketLauncher.cs | 13 +++--- 6 files changed, 58 insertions(+), 30 deletions(-) create mode 100644 src/Paket.VisualStudio/Resources/paket.bootstrapper.exe diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index fb84d00c3..98c71f921 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -30,7 +30,7 @@ true - + @@ -38,9 +38,24 @@ $(NoWarn);NU1603 + + + /usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }' + /usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }' + + + + + + + + + + - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - $([System.IO.File]::ReadAllText('$(PaketLockFilePath)')) + + $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) + $([System.IO.File]::ReadAllText('$(PaketLockFilePath)')) true false true @@ -88,7 +103,7 @@ - + @@ -136,22 +151,29 @@ + + <_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/> + + $(MSBuildProjectDirectory)/$(MSBuildProjectFile) true false true + $(BaseIntermediateOutputPath)$(Configuration) + $(BaseIntermediateOutputPath) - <_NuspecFiles Include="$(BaseIntermediateOutputPath)*.nuspec"/> + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/> - + + PreserveNewest true + diff --git a/src/Paket.VisualStudio/Resources.Designer.cs b/src/Paket.VisualStudio/Resources.Designer.cs index 71ab76712..a4f69e01a 100644 --- a/src/Paket.VisualStudio/Resources.Designer.cs +++ b/src/Paket.VisualStudio/Resources.Designer.cs @@ -1,16 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.35312 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -using System; - -namespace PaketVS { +namespace Paket.VisualStudio { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -18,7 +19,7 @@ namespace PaketVS { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -38,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PacketVS.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Paket.VisualStudio.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -58,5 +59,15 @@ internal Resources() { resourceCulture = value; } } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] paket_bootstrapper { + get { + object obj = ResourceManager.GetObject("paket_bootstrapper", resourceCulture); + return ((byte[])(obj)); + } + } } } diff --git a/src/Paket.VisualStudio/Resources.resx b/src/Paket.VisualStudio/Resources.resx index 891c592b4..00db4cebc 100644 --- a/src/Paket.VisualStudio/Resources.resx +++ b/src/Paket.VisualStudio/Resources.resx @@ -1,13 +1,4 @@  -