From f07bfde8aa4e66be8e957f0972741e7c86020727 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Wed, 19 Dec 2018 11:20:04 -0800 Subject: [PATCH 1/4] fix assembly path for signing --- build.cmd | 8 ++-- build/config/AssemblySignToolData.json | 66 +++++++++++++------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build.cmd b/build.cmd index 389679d5ba4..274f0447da2 100644 --- a/build.cmd +++ b/build.cmd @@ -681,8 +681,8 @@ set asmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck if "%BUILD_NET40%" == "1" ( echo #r @"%USERPROFILE%\.nuget\packages\Newtonsoft.Json\9.0.1\lib\net45\Newtonsoft.Json.dll">%asmvercheckpath%\assemblies.fsx - echo "%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0artifacts\bin" - "%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0artifacts\bin" + echo "%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0artifacts" + "%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0artifacts" if ERRORLEVEL 1 echo Error verifying assembly versions and commit hashes. && goto :failure ) @@ -692,8 +692,8 @@ if not "%SIGN_TYPE%" == "" ( echo %_msbuildexe% build\projects\Signing.proj /t:Restore %_msbuildexe% build\projects\Signing.proj /t:Restore - echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\bin /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json - %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\bin /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json + echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json + %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json if ERRORLEVEL 1 echo Error running sign tool && goto :failure ) diff --git a/build/config/AssemblySignToolData.json b/build/config/AssemblySignToolData.json index 3cd0f5b61c1..55163cb5b14 100644 --- a/build/config/AssemblySignToolData.json +++ b/build/config/AssemblySignToolData.json @@ -4,45 +4,45 @@ "certificate": "Microsoft", "strongName": "StrongName", "values": [ - "FSharp.Core\\*\\*\\FSharp.Core.dll", - "FSharp.Core\\*\\*\\*\\FSharp.Core.resources.dll", - "FSharp.Build\\*\\*\\FSharp.Build.dll", - "FSharp.Build\\*\\*\\*\\FSharp.Build.resources.dll", - "FSharp.Compiler.Private\\*\\*\\FSharp.Compiler.Private.dll", - "FSharp.Compiler.Private\\*\\*\\*\\FSharp.Compiler.Private.resources.dll", - "FSharp.Compiler.Server.Shared\\*\\*\\FSharp.Compiler.Server.Shared.dll", - "FSharp.Compiler.Interactive.Settings\\*\\*\\FSharp.Compiler.Interactive.Settings.dll", - "FSharp.Compiler.Interactive.Settings\\*\\*\\*\\FSharp.Compiler.Interactive.Settings.resources.dll", - "fsc\\*\\*\\fsc.exe", - "fsi\\*\\*\\fsi.exe", - "fsiAnyCpu\\*\\*\\fsiAnyCpu.exe", - "FSharp.VS.FSI\\*\\*\\FSharp.VS.FSI.dll", - "FSharp.VS.FSI\\*\\*\\*\\FSharp.VS.FSI.resources.dll", - "FSharp.LanguageService.Base\\*\\*\\FSharp.LanguageService.Base.dll", - "FSharp.LanguageService.Base\\*\\*\\*\\FSharp.LanguageService.Base.resources.dll", - "FSharp.LanguageService\\*\\*\\FSharp.LanguageService.dll", - "FSharp.LanguageService\\*\\*\\*\\FSharp.LanguageService.resources.dll", - "FSharp.UIResources\\*\\*\\FSharp.UIResources.dll", - "FSharp.UIResources\\*\\*\\*\\FSharp.UIResources.resources.dll", - "FSharp.Editor\\*\\*\\FSharp.Editor.dll", - "FSharp.Editor\\*\\*\\*\\FSharp.Editor.resources.dll", - "FSharp.ProjectSystem.Base\\*\\*\\FSharp.ProjectSystem.Base.dll", - "FSharp.ProjectSystem.Base\\*\\*\\*\\FSharp.ProjectSystem.Base.resources.dll", - "FSharp.ProjectSystem.PropertyPages\\*\\*\\FSharp.ProjectSystem.PropertyPages.dll", - "FSharp.ProjectSystem.PropertyPages\\*\\*\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll", - "FSharp.ProjectSystem.FSharp\\*\\*\\FSharp.ProjectSystem.FSharp.dll", - "FSharp.ProjectSystem.FSharp\\*\\*\\*\\FSharp.ProjectSystem.FSharp.resources.dll", - "FSharp.PatternMatcher\\*\\*\\FSharp.PatternMatcher.dll" + "bin\\FSharp.Core\\*\\*\\FSharp.Core.dll", + "bin\\FSharp.Core\\*\\*\\*\\FSharp.Core.resources.dll", + "bin\\FSharp.Build\\*\\*\\FSharp.Build.dll", + "bin\\FSharp.Build\\*\\*\\*\\FSharp.Build.resources.dll", + "bin\\FSharp.Compiler.Private\\*\\*\\FSharp.Compiler.Private.dll", + "bin\\FSharp.Compiler.Private\\*\\*\\*\\FSharp.Compiler.Private.resources.dll", + "bin\\FSharp.Compiler.Server.Shared\\*\\*\\FSharp.Compiler.Server.Shared.dll", + "bin\\FSharp.Compiler.Interactive.Settings\\*\\*\\FSharp.Compiler.Interactive.Settings.dll", + "bin\\FSharp.Compiler.Interactive.Settings\\*\\*\\*\\FSharp.Compiler.Interactive.Settings.resources.dll", + "bin\\fsc\\*\\*\\fsc.exe", + "bin\\fsi\\*\\*\\fsi.exe", + "bin\\fsiAnyCpu\\*\\*\\fsiAnyCpu.exe", + "bin\\FSharp.VS.FSI\\*\\*\\FSharp.VS.FSI.dll", + "bin\\FSharp.VS.FSI\\*\\*\\*\\FSharp.VS.FSI.resources.dll", + "bin\\FSharp.LanguageService.Base\\*\\*\\FSharp.LanguageService.Base.dll", + "bin\\FSharp.LanguageService.Base\\*\\*\\*\\FSharp.LanguageService.Base.resources.dll", + "bin\\FSharp.LanguageService\\*\\*\\FSharp.LanguageService.dll", + "bin\\FSharp.LanguageService\\*\\*\\*\\FSharp.LanguageService.resources.dll", + "bin\\FSharp.UIResources\\*\\*\\FSharp.UIResources.dll", + "bin\\FSharp.UIResources\\*\\*\\*\\FSharp.UIResources.resources.dll", + "bin\\FSharp.Editor\\*\\*\\FSharp.Editor.dll", + "bin\\FSharp.Editor\\*\\*\\*\\FSharp.Editor.resources.dll", + "bin\\FSharp.PatternMatcher\\*\\*\\FSharp.PatternMatcher.dll", + "bin\\FSharp.PropertiesPages\\*\\*\\FSharp.ProjectSystem.PropertyPages.dll", + "bin\\FSharp.PropertiesPages\\*\\*\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll", + "bin\\ProjectSystem\\*\\*\\FSharp.ProjectSystem.FSharp.dll", + "bin\\ProjectSystem\\*\\*\\*\\FSharp.ProjectSystem.FSharp.resources.dll", + "bin\\ProjectSystem.Base\\*\\*\\FSharp.ProjectSystem.Base.dll", + "bin\\ProjectSystem.Base\\*\\*\\*\\FSharp.ProjectSystem.Base.resources.dll" ] }, { "certificate": "VsixSHA2", "strongName": null, "values": [ - "VisualFSharpFull\\*\\*VisualFSharpFull.vsix", - "VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix", - "..\\VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix", - "..\\VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix" + "bin\\VisualFSharpFull\\*\\*VisualFSharpFull.vsix", + "bin\\VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix", + "VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix", + "VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix" ] } ], From ba73a73330ff2921e9da4ca94fc2c63830618af7 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Thu, 20 Dec 2018 13:48:15 -0800 Subject: [PATCH 2/4] don't unconditionally deploy the templates VSIX on build --- .../Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj b/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj index 0267329af35..110fc964e1c 100644 --- a/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj +++ b/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj @@ -6,7 +6,6 @@ VisualFSharpTemplate Library Microsoft\FSharpTemplates - true From 8c69868ab1bd745efa27bace3b9b6759fe6020a9 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 21 Dec 2018 09:40:57 -0800 Subject: [PATCH 3/4] ensure insertion manifest is written to the correct location --- setup/Swix/Microsoft.FSharp.vsmanproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj index ec9461e1137..6e6f7d4e7e9 100644 --- a/setup/Swix/Microsoft.FSharp.vsmanproj +++ b/setup/Swix/Microsoft.FSharp.vsmanproj @@ -6,7 +6,8 @@ true true - $(OutputPath)\Insertion + $(ArtifactsDir)\VSSetup\$(Configuration)\Insertion + $(OutputPath) $(FSharpPackageVersion) From 6830aaeb89a0c006290b6bab0f2da3b90f8fe159 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 21 Dec 2018 09:43:11 -0800 Subject: [PATCH 4/4] correct package version --- build/targets/AssemblyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/targets/AssemblyVersions.props b/build/targets/AssemblyVersions.props index 5ad08a25fb4..362c26a94a6 100644 --- a/build/targets/AssemblyVersions.props +++ b/build/targets/AssemblyVersions.props @@ -30,7 +30,7 @@ $(FSPackageVersion).0 15 - 8 + 9 $(VSMajorVersion).0 $(VSMajorVersion).$(VSMinorVersion).0.0