[WIP] Fix signing (#6046)

* fix assembly path for signing

* don't unconditionally deploy the templates VSIX on build

* ensure insertion manifest is written to the correct location

* correct package version

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
 )

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"
       ]
     }
   ],

build/targets/AssemblyVersions.props

@@ -30,7 +30,7 @@
     <FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
 
     <VSMajorVersion>15</VSMajorVersion>
-    <VSMinorVersion>8</VSMinorVersion>
+    <VSMinorVersion>9</VSMinorVersion>
     <VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
     <VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0.0</VSAssemblyVersion>
 

setup/Swix/Microsoft.FSharp.vsmanproj

@@ -6,7 +6,8 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <InsertionDir>$(OutputPath)\Insertion</InsertionDir>
+    <OutputPath>$(ArtifactsDir)\VSSetup\$(Configuration)\Insertion</OutputPath>
+    <InsertionDir>$(OutputPath)</InsertionDir>
     <ManifestBuildVersion>$(FSharpPackageVersion)</ManifestBuildVersion>
   </PropertyGroup>
 

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj

@@ -6,7 +6,6 @@
     <AssemblyName>VisualFSharpTemplate</AssemblyName>
     <OutputType>Library</OutputType>
     <ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
-    <DeployExtension>true</DeployExtension>
   </PropertyGroup>
 
   <ItemGroup>