batch-sign assemblies using the Roslyn SignTool (#4088)

* batch-sign assemblies using the Roslyn SignTool

* create MSI installers after the first round of signing

.gitignore

@@ -124,3 +124,4 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 /fcs/TestResult.xml
 /tests/fcs/
 /fcs/.paket/Paket.Restore.targets
+msbuild.binlog

build.cmd

@@ -78,6 +78,8 @@ set TEST_VS_IDEUNIT_SUITE=0
 set INCLUDE_TEST_SPEC_NUNIT=
 set INCLUDE_TEST_TAGS=
 
+set SIGN_TYPE=%PB_SIGNTYPE%
+
 REM ------------------ Parse all arguments -----------------------
 
 set _autoselect=1
@@ -293,6 +295,14 @@ if /i "%ARG%" == "release" (
     set BUILD_CONFIG=release
 )
 
+if /i "%ARG%" == "test-sign" (
+    set SIGN_TYPE=test
+)
+
+if /i "%ARG%" == "real-sign" (
+    set SIGN_TYPE=real
+)
+
 if /i "%ARG%" == "test" (
     set _autoselect_tests=1
 )
@@ -427,6 +437,7 @@ echo.
 echo PB_SKIPTESTS=%PB_SKIPTESTS%
 echo PB_RESTORESOURCE=%PB_RESTORESOURCE%
 echo.
+echo SIGN_TYPE=%SIGN_TYPE%
 echo TEST_NET40_COMPILERUNIT_SUITE=%TEST_NET40_COMPILERUNIT_SUITE%
 echo TEST_NET40_COREUNIT_SUITE=%TEST_NET40_COREUNIT_SUITE%
 echo TEST_NET40_FSHARP_SUITE=%TEST_NET40_FSHARP_SUITE%
@@ -538,15 +549,6 @@ goto :eof
 :havemsbuild
 set _nrswitch=/nr:false
 
-:: See <http://www.appveyor.com/docs/environment-variables>
-if defined APPVEYOR (
-   rem See <http://www.appveyor.com/docs/build-phase>
-   if exist "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" (
-    rem HACK HACK HACK
-   set _msbuildexe=%_msbuildexe% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-   )
-)
-
 if defined TF_BUILD (
     echo Adding remote 'visualfsharptools' for internal build.
     git remote add visualfsharptools https://github.com/Microsoft/visualfsharp.git
@@ -590,6 +592,13 @@ if "%RestorePackages%" == "true" (
         @if ERRORLEVEL 1 echo Error: Nuget restore failed  && goto :failure
     )
 
+    if not "%SIGN_TYPE%" == "" (
+        set signtoolnugetoptions=-PackagesDirectory %USERPROFILE%\.nuget\packages -ConfigFile %_nugetconfig%
+        if not "%PB_RESTORESOURCE%" == "" set signtoolnugetoptions=!signtoolnugetoptions! -FallbackSource %PB_RESTORESOURCE%
+        %_nugetexe% restore build\config\packages.config !signtoolnugetoptions!
+        @if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
+    )
+
     set restore_fsharp_suite=0
     if "%TEST_NET40_FSHARP_SUITE%" == "1" set restore_fsharp_suite=1
     if "%TEST_CORECLR_FSHARP_SUITE%" == "1" set restore_fsharp_suite=1
@@ -673,7 +682,47 @@ if "%BUILD_PHASE%" == "1" (
    @if ERRORLEVEL 1 echo Error build failed && goto :failure
 )
 
-echo ---------------- Done with build, starting pack/update/prepare ---------------
+echo ---------------- Done with build, 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
+    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
+    if ERRORLEVEL 1 echo Error running sign tool && goto :failure
+)
+
+if "%BUILD_SETUP%" == "1" (
+    echo %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%
+         %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%
+    if ERRORLEVEL 1 echo Error building insertion packages && goto :failure
+)
+
+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
+    if ERRORLEVEL 1 echo Error running sign tool && goto :failure
+)
+
+echo ---------------- Done with signing, building insertion files ---------------
+
+if "%BUILD_SETUP%" == "1" (
+    echo %_msbuildexe% %msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG%
+         %_msbuildexe% %msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG%
+    if ERRORLEVEL 1 echo Error building .vsmanproj && goto :failure
+)
+
+echo ---------------- Done building insertion files, starting pack/update/prepare ---------------
 
 if "%BUILD_NET40_FSHARP_CORE%" == "1" (
   echo ----------------  start update.cmd ---------------

build/config/AssemblySignToolData.json

+{
+  "sign": [
+    {
+      "certificate": "Microsoft",
+      "strongName": "StrongName",
+      "values": [
+        "net40\\bin\\FSharp.Core.dll",
+        "net40\\bin\\*\\FSharp.Core.resources.dll",
+        "net40\\bin\\FSharp.Build.dll",
+        "net40\\bin\\*\\FSharp.Build.resources.dll",
+        "net40\\bin\\FSharp.Compiler.Private.dll",
+        "net40\\bin\\*\\FSharp.Compiler.Private.resources.dll",
+        "net40\\bin\\FSharp.Compiler.Server.Shared.dll",
+        "net40\\bin\\FSharp.Compiler.Interactive.Settings.dll",
+        "net40\\bin\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
+        "net40\\bin\\fsc.exe",
+        "net40\\bin\\fsi.exe",
+        "net40\\bin\\fsiAnyCpu.exe",
+        "net40\\bin\\FSharp.VS.FSI.dll",
+        "net40\\bin\\*\\FSharp.VS.FSI.resources.dll",
+        "net40\\bin\\FSharp.LanguageService.Base.dll",
+        "net40\\bin\\*\\FSharp.LanguageService.Base.resources.dll",
+        "net40\\bin\\FSharp.LanguageService.dll",
+        "net40\\bin\\*\\FSharp.LanguageService.resources.dll",
+        "net40\\bin\\FSharp.UIResources.dll",
+        "net40\\bin\\*\\FSharp.UIResources.resources.dll",
+        "net40\\bin\\FSharp.Editor.dll",
+        "net40\\bin\\*\\FSharp.Editor.resources.dll",
+        "net40\\bin\\FSharp.ProjectSystem.Base.dll",
+        "net40\\bin\\*\\FSharp.ProjectSystem.Base.resources.dll",
+        "net40\\bin\\FSharp.ProjectSystem.PropertyPages.dll",
+        "net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
+        "net40\\bin\\FSharp.ProjectSystem.FSharp.dll",
+        "net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
+        "coreclr\\bin\\FSharp.Core.dll",
+        "coreclr\\bin\\*\\FSharp.Core.resources.dll",
+        "coreclr\\bin\\FSharp.Build.dll",
+        "coreclr\\bin\\*\\FSharp.Build.resources.dll",
+        "coreclr\\bin\\FSharp.Compiler.Private.dll",
+        "coreclr\\bin\\*\\FSharp.Compiler.Private.resources.dll",
+        "coreclr\\bin\\FSharp.Compiler.Interactive.Settings.dll",
+        "coreclr\\bin\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
+        "coreclr\\bin\\fsc.exe",
+        "coreclr\\bin\\fsi.exe"
+      ]
+    },
+    {
+      "certificate": "VsixSHA2",
+      "strongName": null,
+      "values": [
+        "net40\\bin\\VisualFSharpFull.vsix",
+        "net40\\bin\\VisualFSharpTemplate.vsix",
+        "net40\\bin\\VisualFSharpOpenSource.vsix",
+        "insertion\\Microsoft.FSharp.Dependencies.vsix",
+        "insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
+      ]
+    }
+  ],
+  "exclude": [
+    "Microsoft.Build.Conversion.Core.dll",
+    "Microsoft.Build.dll",
+    "Microsoft.Build.Engine.dll",
+    "Microsoft.Build.Framework.dll",
+    "Microsoft.Build.Tasks.Core.dll",
+    "Microsoft.Build.Utilities.Core.dll",
+    "Microsoft.DiaSymReader.dll",
+    "Microsoft.DiaSymReader.PortablePdb.dll",
+    "Newtonsoft.Json.dll",
+    "System.ValueTuple.4.3.1.nupkg",
+    "System.Collections.Immutable.dll",
+    "System.Reflection.Metadata.dll",
+    "System.ValueTuple.dll"
+  ]
+}

build/config/InsertionSignToolData.json

+{
+    "sign": [
+      {
+        "certificate": "VsixSHA2",
+        "strongName": null,
+        "values": [
+          "insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix"
+        ]
+      }
+    ],
+    "exclude": [
+    ]
+  }
+  
\ No newline at end of file

build/config/MsiSignToolData.json

+{
+    "sign": [
+      {
+        "certificate": "Microsoft400",
+        "strongName": null,
+        "values": [
+          "msi\\Microsoft.FSharp.SDK.Core.msi",
+          "msi\\Microsoft.FSharp.SDK.Resources.*.msi"
+        ]
+      }
+    ],
+    "exclude": [
+    ]
+  }
+  
\ No newline at end of file

build/config/packages.config

+<packages>
+  <package id="MicroBuild.Core" version="0.2.0" />
+  <package id="MicroBuild.Core.Sentinel" version="1.0.0" />
+  <package id="RoslynTools.SignTool" version="1.0.0-beta-62328-01" />
+</packages>

build/scripts/run-signtool.cmd

+@echo off
+:: Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+setlocal enableDelayedExpansion
+set scriptdir=%~dp0
+set MSBuild=
+set SignType=
+set ConfigFile=
+
+::
+:: Validate arguments
+::
+
+:parsearg
+if "%1" == "" goto doneargs
+set arg=%1
+set argv=%2
+
+if /i "%arg%" == "/?" goto help
+if /i "%arg%" == "-h" goto help
+if /i "%arg%" == "--help" goto help
+if /i "%arg%" == "-MSBuild" (
+    set MSBuild=%argv%
+    shift
+)
+if /i "%arg%" == "-SignType" (
+    set SignType=%argv%
+    shift
+)
+if /i "%arg%" == "-ConfigFile" (
+    set ConfigFile=%argv%
+    shift
+)
+
+shift
+goto parsearg
+
+:doneargs
+
+if not defined MSBuild echo Location of MSBuild.exe not specified. && goto error
+if not defined ConfigFile echo Configuration file not specified. && goto error
+if not exist "%MSBuild%" echo The specified MSBuild.exe does not exist. && goto error
+
+set NUGET_PACKAGES=%USERPROFILE%\.nuget\packages
+set _signtoolexe=%NUGET_PACKAGES%\RoslynTools.SignTool\1.0.0-beta-62328-01\tools\SignTool.exe
+set SignToolArgs=-msbuildPath %MSBuild% -config "%ConfigFile%" -nugetPackagesPath "%NUGET_PACKAGES%"
+if /i "%SignType%" == "real" goto runsigntool
+if /i "%SignType%" == "test" set SignToolArgs=%SignToolArgs% -testSign && goto runsigntool
+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"
+echo "%_signtoolexe%" %SignToolArgs%
+     "%_signtoolexe%" %SignToolArgs%
+if errorlevel 1 goto error
+goto :EOF
+
+:help
+echo Usage: %0 -MSBuild path\to\msbuild.exe -ConfigFile path\to\SignToolData.json [-SignType ^<real/test^>]
+goto :EOF
+
+:error
+echo Error running the sign tool.
+exit /b 1

setup/FSharp.SDK/FSharp.SDK.wixproj

@@ -56,12 +56,6 @@
     <Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Runtime_LangPack.wxs" />
   </ItemGroup>
 
-  <ItemGroup>
-      <FilesToSign Include="$(OutDir)$(OutputName).msi">
-         <Authenticode>Microsoft400</Authenticode>
-      </FilesToSign>
-  </ItemGroup>
-
   <Import Project="$(WixInstallPath)\wix.targets" />
   <Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
 
@@ -77,7 +71,7 @@
     <ItemGroup>
         <MsiPath Include="$(OutDir)$(OutputName).msi" />
     </ItemGroup>
-  
+
     <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\msi\%(Filename)%(Extension)')" />
   </Target>
 </Project>
\ No newline at end of file

setup/FSharp.Setup.props

@@ -5,6 +5,7 @@
         <SchemaVersion>2.0</SchemaVersion>
         <ProductVersion>3.10</ProductVersion>
         <WiXToolset2015Version>3.10.0.1503</WiXToolset2015Version>
+        <SetupRootFolder>$(MSBuildThisFileDirectory)</SetupRootFolder>
         <WixInstallPath>$(SetupRootFolder)\..\packages\WiX.Toolset.2015.$(WiXToolset2015Version)\tools\wix</WixInstallPath>
         <NugetPackagesDir>$(SetupRootFolder)\..\packages</NugetPackagesDir>
     </PropertyGroup>
@@ -26,7 +27,7 @@
 
     <PropertyGroup>
         <BinariesDir>$(SetupRootFolder)\..\$(Configuration)</BinariesDir>
-        <VsixBuildLocation>$(BinariesDir)\$(TargetDotnetProfile)\bin</VsixBuildLocation>
+        <VsixBuildLocation>$(BinariesDir)\$(TargetDotnetProfile)\bin\</VsixBuildLocation>
         <InsertionDir>$(BinariesDir)\insertion</InsertionDir>
         <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
         <OutputPath Condition="'$(Lang)' == ''">$(BinariesDir)\setup</OutputPath>

setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj

@@ -31,8 +31,8 @@
   <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
   </Target>
-  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <!-- SWIX plugin adds the built vsix to signing automatically -->
+
+  <Target Name="SignFiles">
+    <!-- Signing is handled by the RoslynSignTool -->
   </Target>
 </Project>

setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj

@@ -28,8 +28,8 @@
   <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
   </Target>
-  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <!-- MSI is already signed before wrapping it here -->
+
+  <Target Name="SignFiles">
+    <!-- Signing is handled by the RoslynSignTool -->
   </Target>
 </Project>

setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj

@@ -35,11 +35,6 @@
   <ItemGroup Condition="'$(IsLangPack)' == 'true'">
     <Package Include="Files.swr" />
   </ItemGroup>
-  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <!-- MSI is already signed before wrapping it here -->
-  </Target>
-  
   <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
     <Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
@@ -48,4 +43,8 @@
     <Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
   </Target>
+
+  <Target Name="SignFiles">
+    <!-- Signing is handled by the RoslynSignTool -->
+  </Target>
 </Project>

setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj

@@ -35,11 +35,6 @@
     <Package Include="Files.swr" />
     <Package Include="Templates.swr" />
   </ItemGroup>
-  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <!-- SWIX plugin adds the built vsix to signing automatically -->
-  </Target>
-  
   <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
     <Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
@@ -49,4 +44,8 @@
     <Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
   </Target>
+
+  <Target Name="SignFiles">
+    <!-- Signing is handled by the RoslynSignTool -->
+  </Target>
 </Project>

setup/Swix/Microsoft.FSharp.vsmanproj

@@ -9,11 +9,23 @@
         <FinalizeSkipLayout>true</FinalizeSkipLayout>
         <IsPackage>true</IsPackage>
         <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion</OutputPath>
+        <InsertionDir>$(OutputPath)</InsertionDir>
     </PropertyGroup>
 
+    <ItemGroup>
+        <InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
+        <InsertionItems Include="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
+        <InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
+        <InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
+    </ItemGroup>
+
     <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-    <Target Name="IncludeFSharpManifests">
+
+    <Target Name="CopyInsertionItems">
+        <Copy SourceFiles="@(InsertionItems)" DestinationFolder="$(InsertionDir)" />
+    </Target>
+
+    <Target Name="IncludeFSharpManifests" DependsOnTargets="CopyInsertionItems">
         <ItemGroup>
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Core.json" />
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json" />

setup/build-insertion.proj

+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+
+    <Import Project="..\src\Microbuild.Settings.targets" />
+
+    <PropertyGroup>
+        <SetupRootFolder>.</SetupRootFolder>
+        <TargetDotnetProfile Condition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>
+        <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    </PropertyGroup>
+
+    <Import Project="FSharp.Setup.props" />
+
+    <Target Name="CollectSetupProjects">
+        <ItemGroup>
+            <SwixSetupProjects Include="Microsoft.FSharp.SDK.Core.swixproj">
+                <ProjectPath>Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj</ProjectPath>
+            </SwixSetupProjects>
+        </ItemGroup>
+
+        <CreateItem Include="@(SetupLanguages)"
+                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK.Resources\Microsoft.FSharp.SDK.Resources.swixproj">
+            <Output ItemName="SwixSetupProjects" TaskParameter="Include"/>
+        </CreateItem>
+    </Target>
+
+    <Target Name="Build" DependsOnTargets="CollectSetupProjects">
+        <PropertyGroup>
+          <CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
+        </PropertyGroup>
+        <MSBuild Projects="%(SwixSetupProjects.ProjectPath)"
+                 Targets="Build"
+                 Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>
+    </Target>
+
+    <Target Name="CopyLocalizationResources" BeforeTargets="Build">
+        <ItemGroup>
+            <SetupLocalizationResources Include="resources\**\*.*" />
+        </ItemGroup>
+
+        <Copy SourceFiles="@(SetupLocalizationResources)"
+              DestinationFiles="@(SetupLocalizationResources->'$(OutputPath)\resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </Target>
+</Project>

setup/build-msi.proj

+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+
+    <Import Project="..\src\Microbuild.Settings.targets" />
+
+    <PropertyGroup>
+        <SetupRootFolder>.</SetupRootFolder>
+        <TargetDotnetProfile Condition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>
+        <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    </PropertyGroup>
+
+    <Import Project="FSharp.Setup.props" />
+
+    <Target Name="CollectSetupProjects">
+        <ItemGroup>
+            <WixSetupProjects Include="FSharp.Wix.Extensions.csproj">
+                <ProjectPath>FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj</ProjectPath>
+            </WixSetupProjects>
+        </ItemGroup>
+
+        <CreateItem Include="@(SetupLanguages)"
+                    AdditionalMetadata="ProjectPath=FSharp.SDK\FSharp.SDK.wixproj">
+            <Output ItemName="WixSetupProjects" TaskParameter="Include"/>
+        </CreateItem>
+    </Target>
+
+    <Target Name="Build" DependsOnTargets="CollectSetupProjects">
+        <PropertyGroup>
+          <CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
+        </PropertyGroup>
+        <!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages -->
+        <MSBuild Projects="%(WixSetupProjects.ProjectPath)"
+                 Targets="Clean;Build"
+                 Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentId=%(WixSetupProjects.LocaleParentId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>
+    </Target>
+
+    <Target Name="CopyLocalizationResources" BeforeTargets="Build">
+        <ItemGroup>
+            <SetupLocalizationResources Include="resources\**\*.*" />
+        </ItemGroup>
+
+        <Copy SourceFiles="@(SetupLocalizationResources)"
+              DestinationFiles="@(SetupLocalizationResources->'$(OutputPath)\resources\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </Target>
+</Project>

setup/fsharp-setup-build.proj

@@ -13,30 +13,17 @@
 
     <Target Name="CollectSetupProjects">
         <ItemGroup>
-            <WixSetupProjects Include="FSharp.Wix.Extensions.csproj">
-                <ProjectPath>FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj</ProjectPath>
-            </WixSetupProjects>
-        </ItemGroup>
-
-        <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=FSharp.SDK\FSharp.SDK.wixproj">
-            <Output ItemName="WixSetupProjects" TaskParameter="Include"/>
-        </CreateItem>
-
-        <ItemGroup>
-            <SwixSetupProjects Include="Microsoft.FSharp.SDK.Core.swixproj">
-                <ProjectPath>Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj</ProjectPath>
-            </SwixSetupProjects>
             <VsixProjects Include="VisualFSharpFull.csproj">
                 <ProjectPath>..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj</ProjectPath>
             </VsixProjects>
+            <VsixProjects Include="VisualFSharpOpenSource.csproj">
+                <ProjectPath>..\vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj</ProjectPath>
+            </VsixProjects>
+            <VsixProjects Include="VisualFSharpTemplates.csproj">
+                <ProjectPath>..\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj</ProjectPath>
+            </VsixProjects>
         </ItemGroup>
 
-        <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK.Resources\Microsoft.FSharp.SDK.Resources.swixproj">
-            <Output ItemName="SwixSetupProjects" TaskParameter="Include"/>
-        </CreateItem>
-
         <CreateItem Include="@(SetupLanguages)"
                     AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj">
             <Output ItemName="SwixSetupProjects" TaskParameter="Include"/>
@@ -47,36 +34,18 @@
                 <ProjectPath>Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj</ProjectPath>
             </SwixSetupProjects>
         </ItemGroup>
-
-        <ItemGroup>
-            <InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
-            <InsertionItems Include="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
-            <InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
-            <InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
-        </ItemGroup>
     </Target>
 
     <Target Name="Build" DependsOnTargets="CollectSetupProjects">
         <PropertyGroup>
           <CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
         </PropertyGroup>
-        <!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages -->
-        <MSBuild Projects="%(WixSetupProjects.ProjectPath)"
-                 Targets="Clean;Build"
-                 Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentId=%(WixSetupProjects.LocaleParentId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>
         <MSBuild Projects="%(VsixProjects.ProjectPath)"
                  Targets="Build"
-                 Properties="IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(InsertionDir);$(CustomProps)" />
+                 Properties="Configuration=$(Configuration);IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(VsixBuildLocation);$(CustomProps)" />
         <MSBuild Projects="%(SwixSetupProjects.ProjectPath)"
                  Targets="Build"
                  Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/>
-
-        <!-- copy json stuff -->
-        <Copy SourceFiles="@(InsertionItems)" DestinationFolder="$(InsertionDir)" />
-
-        <MSBuild Projects="Swix\Microsoft.FSharp.vsmanproj"
-                 Targets="Build"
-                 Properties="$(CustomProps)" />
     </Target>
 
     <Target Name="CopyLocalizationResources" BeforeTargets="Build">

src/fsharp/FSharp.Build/FSharp.Build.fsproj

@@ -81,14 +81,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>

src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj

@@ -44,14 +44,4 @@
       <Name>FSharp.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

@@ -37,16 +37,6 @@
   <Import Project="$(FSharpSourcesRoot)\.nuget\NuGet.targets" Condition="Exists('$(FSharpSourcesRoot)\.nuget\NuGet.targets')" />
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
   <Import Project="$(FsLexToolPath)\FsLexYacc.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
   <ItemGroup>
     <InternalsVisibleTo Include="fsc" />
     <InternalsVisibleTo Include="FSharp.Build" />

src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj

@@ -38,14 +38,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
-  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>

src/fsharp/FSharp.Core/FSharp.Core.fsproj

@@ -259,17 +259,6 @@
     <Copy SourceFiles="$(IntermediateOutputPath)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
   </Target>
 
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
-
   <Target Name="nugetpack"
           DependsOnTargets="CreateOrUpdateBuildVersionFile"
           AfterTargets="Build"

src/fsharp/Fsc/Fsc.fsproj

@@ -62,15 +62,4 @@
     </ProjectReference>
   </ItemGroup>
 
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
-
 </Project>

src/fsharp/fsi/Fsi.fsproj

@@ -72,14 +72,4 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj

@@ -56,15 +56,4 @@
       <Name>FSharp.Core</Name>
     </ProjectReference>
   </ItemGroup>
-
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj

@@ -274,12 +274,4 @@
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>VsixSHA2</Authenticode>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>

vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj

@@ -113,98 +113,98 @@
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
       <Project>{649FA588-F02E-457C-9FCF-87E46407481E}</Project>
       <Name>FSharp.Compiler.Interactive.Settings</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj">
       <Project>{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}</Project>
       <Name>FSharp.Compiler.Server.Shared</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
       <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
       <Name>FSharp.Compiler.Private</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj">
       <Project>{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}</Project>
       <Name>FsiAnyCPU</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\fsharp\fsi\Fsi.fsproj">
       <Project>{D0E98C0D-490B-4C61-9329-0862F6E87645}</Project>
       <Name>Fsi</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj">
       <Project>{65e0e82a-eace-4787-8994-888674c2fe87}</Project>
       <Name>FSharp.Editor</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj">
       <Project>{c4586a06-1402-48bc-8e35-a1b8642f895b}</Project>
       <Name>FSharp.UIResources</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj">
       <Project>{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}</Project>
       <Name>FSharp.LanguageService.Base</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj">
       <Project>{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}</Project>
       <Name>FSharp.LanguageService</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj">
       <Project>{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}</Project>
       <Name>ProjectSystem.Base</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj">
       <Project>{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}</Project>
       <Name>ProjectSystem</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.PropertyPages\FSharp.PropertiesPages.vbproj">
       <Project>{FCFB214C-462E-42B3-91CA-FC557EFEE74F}</Project>
       <Name>FSharp.PropertiesPages</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj">
       <Project>{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}</Project>
       <Name>FSharp.VS.FSI</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
     </ProjectReference>
@@ -300,12 +300,4 @@
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>VsixSHA2</Authenticode>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj

@@ -119,12 +119,4 @@
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>VsixSHA2</Authenticode>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

@@ -283,14 +283,4 @@
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
   <Import Project="$(VsSDKTargets)" />
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj

@@ -260,14 +260,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
   <Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj

@@ -32,16 +32,6 @@
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets" />
   <Import Project="$(VsSDKTargets)" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
   <ItemGroup>
     <InternalsVisibleTo Include="Fsc" />
     <InternalsVisibleTo Include="Fsi" />

vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj

@@ -293,14 +293,4 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
   <Import Project="$(VsSDKTargets)" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj

@@ -40,16 +40,6 @@
   <Target Name="CopyCtoFile">
     <Copy SourceFiles="@(VSCTCompile->'$(IntermediateOutputPath)%(FileName).cto')" DestinationFiles="@(VSCTCompile->'ctofiles\%(FileName).cto')" />
   </Target>
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
   <Target Name="CopyLocalizationResources">
     <ItemGroup>
       <LocalizationResources Include="MenusAndCommands.vsct" />

vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj

@@ -382,15 +382,4 @@
   
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
   <Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
-  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-         <Authenticode>Microsoft</Authenticode>
-         <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj

@@ -108,14 +108,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file

vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj

@@ -29,16 +29,6 @@
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets" />
   <Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
-    <ItemGroup>
-      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
-      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />
-      <FilesToSign Include="@(BinariesToBeSigned)">
-        <Authenticode>Microsoft</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </FilesToSign>
-    </ItemGroup>
-  </Target>
 
   <ItemGroup>
     <InternalsVisibleTo Include="FSharp.Editor" />