Merge pull request #4819 from Microsoft/compiler-vsix

remove MSI package and replace with app-local VSIX packages

Author: brettfo

build.cmd

@@ -771,8 +771,8 @@ if "%BUILD_NET40%" == "1" (
 echo ---------------- Done with assembly version checks, starting assembly signing ---------------
 
 if not "%SIGN_TYPE%" == "" (
-    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
-    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
+    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
+    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 
@@ -783,20 +783,8 @@ echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BU
 if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure
 
 if not "%SIGN_TYPE%" == "" (
-    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
-    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
-    if ERRORLEVEL 1 echo Error running sign tool && goto :failure
-)
-
-if "%BUILD_SETUP%" == "1" (
-    echo %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
-         %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
-    if ERRORLEVEL 1 echo Error building MSI && goto :failure
-)
-
-if not "%SIGN_TYPE%" == "" (
-    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
-    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
+    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
+    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 
@@ -807,8 +795,8 @@ if "%BUILD_SETUP%" == "1" (
 )
 
 if not "%SIGN_TYPE%" == "" (
-    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
-    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
+    echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
+    call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 

build/config/InsertionSignToolData.json

@@ -1,14 +1,37 @@
 {
-    "sign": [
-      {
-        "certificate": "VsixSHA2",
-        "strongName": null,
-        "values": [
-          "insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix"
-        ]
-      }
-    ],
-    "exclude": [
-    ]
-  }
-  
+  "sign": [
+    {
+      "certificate": "VsixSHA2",
+      "strongName": null,
+      "values": [
+        "insertion\\Microsoft.FSharp.Compiler.vsix",
+        "insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
+        "insertion\\Microsoft.FSharp.SDK.vsix"
+      ]
+    }
+  ],
+  "exclude": [
+    "fsc.exe",
+    "FSharp.Build.dll",
+    "FSharp.Build.resources.dll",
+    "FSharp.Core.dll",
+    "FSharp.Core.resources.dll",
+    "FSharp.Compiler.Private.dll",
+    "FSharp.Compiler.Private.resources.dll",
+    "FSharp.Compiler.Server.Shared.dll",
+    "FSharp.Compiler.Interactive.Settings.dll",
+    "FSharp.Compiler.Interactive.Settings.resources.dll",
+    "fsi.exe",
+    "fsiAnyCpu.exe",
+    "FSharp.Data.TypeProviders.dll",
+    "Microsoft.Build.dll",
+    "Microsoft.Build.Conversion.Core.dll",
+    "Microsoft.Build.Engine.dll",
+    "Microsoft.Build.Framework.dll",
+    "Microsoft.Build.Tasks.Core.dll",
+    "Microsoft.Build.Utilities.Core.dll",
+    "System.Collections.Immutable.dll",
+    "System.Reflection.Metadata.dll",
+    "System.ValueTuple.dll"
+  ]
+}

build/config/MsiSignToolData.json

@@ -26,6 +26,10 @@ if /i "%arg%" == "-SignType" (
     set SignType=%argv%
     shift
 )
+if /i "%arg%" == "-Configuration" (
+    set Configuration=%argv%
+    shift
+)
 if /i "%arg%" == "-ConfigFile" (
     set ConfigFile=%argv%
     shift
@@ -50,7 +54,7 @@ set SignToolArgs=%SignToolArgs% -test
 :runsigntool
 
 if not exist "%_signtoolexe%" echo The signing tool could not be found at location '%_signtoolexe%' && goto error
-set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\release"
+set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\%Configuration%"
 echo "%_signtoolexe%" %SignToolArgs%
      "%_signtoolexe%" %SignToolArgs%
 if errorlevel 1 goto error

build/scripts/run-signtool.cmd

@@ -0,0 +1,2 @@
+net4*/
+netstandard*/