From 6210660a364fb73fd5efa167bf91e51122323c80 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 2 Jun 2016 12:38:56 -0700
Subject: [PATCH 1/3] Ngen support for VisualFSharpVsix

---
 .../Desktop/Source.extension.vsixmanifest     | 19 +++++++++++++++++++
 .../Source.extension.vsixmanifest             | 19 +++++++++++++++++++
 .../Source.extension.vsixmanifest             | 19 +++++++++++++++++++
 .../Source.extension.vsixmanifest             | 19 +++++++++++++++++++
 4 files changed, 76 insertions(+)

diff --git a/vsintegration/VisualFSharpVsix/ShippingManifests/Desktop/Source.extension.vsixmanifest b/vsintegration/VisualFSharpVsix/ShippingManifests/Desktop/Source.extension.vsixmanifest
index 4445242d246..c6f51b034f6 100644
--- a/vsintegration/VisualFSharpVsix/ShippingManifests/Desktop/Source.extension.vsixmanifest
+++ b/vsintegration/VisualFSharpVsix/ShippingManifests/Desktop/Source.extension.vsixmanifest
@@ -5,10 +5,29 @@
     <Identity Id="VisualFSharp" Version="15.4.1.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
     <DisplayName>Visual F# Tools</DisplayName>
     <Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
+    <ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.VSWinDesktopExpress" Version="[15.0]" />
   </Installation>
+  <Installer>
+    <Actions>
+      <Action Type="Ngen" Path="FsiAnyCPU.exe" />
+      <Action Type="Ngen" Path="Fsi.exe" />
+      <Action Type="Ngen" Path="FSharp.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Interactive.Settings.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Server.Shared.dll" />
+      <Action Type="Ngen" Path="FSharp.Core.dll" />
+      <Action Type="Ngen" Path="FSharp.Editor.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.FSharp.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.PropertyPages.dll" />
+      <Action Type="Ngen" Path="FSharp.VS.FSI.dll" />
+    </Actions>
+  </Installer>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
diff --git a/vsintegration/VisualFSharpVsix/ShippingManifests/Professional/Source.extension.vsixmanifest b/vsintegration/VisualFSharpVsix/ShippingManifests/Professional/Source.extension.vsixmanifest
index c2ced20884b..2701f6f7c7a 100644
--- a/vsintegration/VisualFSharpVsix/ShippingManifests/Professional/Source.extension.vsixmanifest
+++ b/vsintegration/VisualFSharpVsix/ShippingManifests/Professional/Source.extension.vsixmanifest
@@ -5,10 +5,29 @@
     <Identity Id="VisualFSharp" Version="15.4.1.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
     <DisplayName>Visual F# Tools</DisplayName>
     <Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
+    <ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
   </Installation>
+  <Installer>
+    <Actions>
+      <Action Type="Ngen" Path="FsiAnyCPU.exe" />
+      <Action Type="Ngen" Path="Fsi.exe" />
+      <Action Type="Ngen" Path="FSharp.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Interactive.Settings.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Server.Shared.dll" />
+      <Action Type="Ngen" Path="FSharp.Core.dll" />
+      <Action Type="Ngen" Path="FSharp.Editor.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.FSharp.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.PropertyPages.dll" />
+      <Action Type="Ngen" Path="FSharp.VS.FSI.dll" />
+    </Actions>
+  </Installer>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
diff --git a/vsintegration/VisualFSharpVsix/ShippingManifests/WebDevelopment/Source.extension.vsixmanifest b/vsintegration/VisualFSharpVsix/ShippingManifests/WebDevelopment/Source.extension.vsixmanifest
index 58b5919c245..60b92d7e94b 100644
--- a/vsintegration/VisualFSharpVsix/ShippingManifests/WebDevelopment/Source.extension.vsixmanifest
+++ b/vsintegration/VisualFSharpVsix/ShippingManifests/WebDevelopment/Source.extension.vsixmanifest
@@ -5,10 +5,29 @@
     <Identity Id="VisualFSharp" Version="15.4.1.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
     <DisplayName>Visual F# Tools</DisplayName>
     <Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
+    <ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.VWDExpress" Version="[15.0]" />
   </Installation>
+  <Installer>
+    <Actions>
+      <Action Type="Ngen" Path="FsiAnyCPU.exe" />
+      <Action Type="Ngen" Path="Fsi.exe" />
+      <Action Type="Ngen" Path="FSharp.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Interactive.Settings.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Server.Shared.dll" />
+      <Action Type="Ngen" Path="FSharp.Core.dll" />
+      <Action Type="Ngen" Path="FSharp.Editor.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.FSharp.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.PropertyPages.dll" />
+      <Action Type="Ngen" Path="FSharp.VS.FSI.dll" />
+    </Actions>
+  </Installer>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>
diff --git a/vsintegration/VisualFSharpVsix/Source.extension.vsixmanifest b/vsintegration/VisualFSharpVsix/Source.extension.vsixmanifest
index c2ced20884b..2701f6f7c7a 100644
--- a/vsintegration/VisualFSharpVsix/Source.extension.vsixmanifest
+++ b/vsintegration/VisualFSharpVsix/Source.extension.vsixmanifest
@@ -5,10 +5,29 @@
     <Identity Id="VisualFSharp" Version="15.4.1.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
     <DisplayName>Visual F# Tools</DisplayName>
     <Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
+    <ShortcutPath>..\CommonExtensions\Microsoft\FSharp</ShortcutPath>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
   </Installation>
+  <Installer>
+    <Actions>
+      <Action Type="Ngen" Path="FsiAnyCPU.exe" />
+      <Action Type="Ngen" Path="Fsi.exe" />
+      <Action Type="Ngen" Path="FSharp.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Interactive.Settings.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Server.Shared.dll" />
+      <Action Type="Ngen" Path="FSharp.Core.dll" />
+      <Action Type="Ngen" Path="FSharp.Editor.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.Compiler.dll" />
+      <Action Type="Ngen" Path="FSharp.LanguageService.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.Base.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.FSharp.dll" />
+      <Action Type="Ngen" Path="FSharp.ProjectSystem.PropertyPages.dll" />
+      <Action Type="Ngen" Path="FSharp.VS.FSI.dll" />
+    </Actions>
+  </Installer>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
   </Dependencies>

From aa5b1e5828e66aaddfa5a4f2e3cb79fbee560a4f Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Mon, 6 Jun 2016 16:54:39 -0700
Subject: [PATCH 2/3] Added VS insertion manifests

---
 build-everything.proj                         | 22 +++++++++----------
 setup/FSharp.SDK/FSharp.SDK.wixproj           |  2 +-
 .../Insertion/FSharp.SDK/FSharp.SDK.swixproj  | 21 ++++++++++++++++++
 setup/Insertion/FSharp.SDK/FSharp.SDK.swr     | 15 +++++++++++++
 setup/Insertion/Insertion.vsmanproj           | 16 ++++++++++++++
 .../VisualFSharpVSIX.swixproj                 | 20 +++++++++++++++++
 .../VisualFSharpVSIX/VisualFSharpVSIX.swr     | 16 ++++++++++++++
 setup/fsharp-setup-build.proj                 | 17 +++++++++++---
 .../VisualFSharpVsix/VisualFSharpVsix.csproj  |  2 +-
 9 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 setup/Insertion/FSharp.SDK/FSharp.SDK.swixproj
 create mode 100644 setup/Insertion/FSharp.SDK/FSharp.SDK.swr
 create mode 100644 setup/Insertion/Insertion.vsmanproj
 create mode 100644 setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swixproj
 create mode 100644 setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swr

diff --git a/build-everything.proj b/build-everything.proj
index 4c370b0d1fc..41b691c8dc9 100644
--- a/build-everything.proj
+++ b/build-everything.proj
@@ -1,23 +1,23 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
 
-  <ItemGroup Condition="'$(BUILD_NET40)'=='1'">
+  <ItemGroup Condition="'$(BUILD_NET40)'=='1' or '$(BUILD_ALL)'=='1'">
     <ProjectsWithDefaultFramework Include="src/fsharp-library-build.proj" />
     <ProjectsWithDefaultFramework Include="src/fsharp-compiler-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj"  Condition="'$(TEST_NET40_COREUNIT)'=='1'" />
-    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1'" />
-    <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj"         Condition="'$(TEST_FSHARP_SUITE)'=='1'" />
+    <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj"  Condition="'$(TEST_NET40_COREUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
+    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
+    <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj"         Condition="'$(TEST_FSHARP_SUITE)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj"           Condition="'$(BUILD_PORTABLE)'=='1'"/>
-    <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1'" />
+    <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj"           Condition="'$(BUILD_PORTABLE)'=='1' or '$(BUILD_ALL)'=='1'"/>
+    <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BUILD_VS)'=='1'">
+  <ItemGroup Condition="'$(BUILD_VS)'=='1' or '$(BUILD_ALL)'=='1'">
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
@@ -25,20 +25,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1'" />
+    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
+  <ItemGroup Condition="'$(BUILD_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'">
     <ProjectsWithCoreClr Include="src/fsharp-library-build.proj" />
     <ProjectsWithCoreClr Include="src/fsharp-compiler-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1'" />
+    <ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
   <ItemGroup>
-    <SetupProjects Include="setup/fsharp-setup-build.proj" Condition="'$(BUILD_SETUP)'=='1'" />
+    <SetupProjects Include="setup/fsharp-setup-build.proj" Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
   
   <Target Name="Build">
diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
index 1483ed4ae4f..64a014b5cb6 100644
--- a/setup/FSharp.SDK/FSharp.SDK.wixproj
+++ b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -68,6 +68,6 @@
         <MsiPath Include="$(OutDir)$(OutputName).msi" />
     </ItemGroup>
   
-    <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\insertion\$(Lang)\%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\insertion\msi\$(Lang)\%(Filename)%(Extension)')" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/setup/Insertion/FSharp.SDK/FSharp.SDK.swixproj b/setup/Insertion/FSharp.SDK/FSharp.SDK.swixproj
new file mode 100644
index 00000000000..717b05185af
--- /dev/null
+++ b/setup/Insertion/FSharp.SDK/FSharp.SDK.swixproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
+    <OutputArchitecture>neutral</OutputArchitecture>
+    <OutputLocalized>false</OutputLocalized>
+    <OutputType>manifest</OutputType>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion\json</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
+
+  <PropertyGroup>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);InsertionFolder=$(FSharpSourcesRoot)\..\$(Configuration)\insertion</PackagePreprocessorDefinitions>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Package Include="FSharp.SDK.swr" />
+  </ItemGroup>
+</Project>
diff --git a/setup/Insertion/FSharp.SDK/FSharp.SDK.swr b/setup/Insertion/FSharp.SDK/FSharp.SDK.swr
new file mode 100644
index 00000000000..c8be14a0d23
--- /dev/null
+++ b/setup/Insertion/FSharp.SDK/FSharp.SDK.swr
@@ -0,0 +1,15 @@
+use vs
+
+package name=Microsoft.FSharp
+        version=4.1
+        vs.package.type=msi
+        vs.package.chip=neutral
+        vs.package.language=neutral
+  
+vs.localizedResources
+  vs.localizedResource language=en-us
+                       title="Visual F# Tools"
+                       description="Deploy Visual F# Tools templates to Visual Studio"
+
+vs.payloads
+  vs.payload source=$(InsertionFolder)\msi\ENU\FSharp.SDK.msi
diff --git a/setup/Insertion/Insertion.vsmanproj b/setup/Insertion/Insertion.vsmanproj
new file mode 100644
index 00000000000..21c51ecf689
--- /dev/null
+++ b/setup/Insertion/Insertion.vsmanproj
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FSharpSourcesRoot>..\..\src</FSharpSourcesRoot>
+    <FinalizeManifest>true</FinalizeManifest>
+    <FinalizeSkipLayout>true</FinalizeSkipLayout>
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion\json</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
+
+  <ItemGroup>
+    <MergeManifest Include="$(OutputPath)\VisualFSharpVSIX.json" />
+    <MergeManifest Include="$(OutputPath)\FSharp.SDK.json" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swixproj b/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swixproj
new file mode 100644
index 00000000000..ee71a943031
--- /dev/null
+++ b/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swixproj
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
+    <OutputArchitecture>neutral</OutputArchitecture>
+    <OutputLocalized>false</OutputLocalized>
+    <OutputType>manifest</OutputType>
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion\json</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
+
+  <PropertyGroup>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);InsertionFolder=$(FSharpSourcesRoot)\..\$(Configuration)\insertion</PackagePreprocessorDefinitions>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Package Include="VisualFSharpVSIX.swr" />
+  </ItemGroup>
+</Project>
diff --git a/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swr b/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swr
new file mode 100644
index 00000000000..944cdd6bb99
--- /dev/null
+++ b/setup/Insertion/VisualFSharpVSIX/VisualFSharpVSIX.swr
@@ -0,0 +1,16 @@
+use vs
+
+package name=Microsoft.FSharp
+        version=4.1
+        vs.package.chip=neutral
+        vs.package.language=en-us
+        vs.package.type=vsix
+        vs.package.vsixId=VisualFSharp
+
+vs.localizedResources
+  vs.localizedResource language=en-us
+                       title="Visual F# Tools"
+                       description="Deploy Visual F# Tools templates to Visual Studio"
+
+vs.payloads
+  vs.payload source=$(InsertionFolder)\vsix\VisualFSharpVsix.Professional.vsix
diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj
index 60a7b5d5b09..9c018d37e84 100644
--- a/setup/fsharp-setup-build.proj
+++ b/setup/fsharp-setup-build.proj
@@ -16,19 +16,30 @@
     <Import Project="FSharp.Setup.props" />
 
     <Target Name="Build">
-        <MSBuild Projects="FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj" Targets="Build" />       
+        <MSBuild Projects="FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj" Targets="Build" />
+        
         <!-- Wix targets files doesn't handle localization parameters correctly. Rebuilding all to clean obj files between languages -->
         <MSBuild Projects="FSharp.SDK\FSharp.SDK.wixproj" Targets="Rebuild" Properties="Lang=%(SetupLanguages.Identity)"/>
+        
+        <MSBuild Projects="Insertion\FSharp.SDK\FSharp.SDK.swixproj" Targets="Build" />
+        <MSBuild Projects="Insertion\VisualFSharpVSIX\VisualFSharpVSIX.swixproj" Targets="Build" />
+        <MSBuild Projects="Insertion\Insertion.vsmanproj" Targets="Build" />
     </Target>
     
     <Target Name="Rebuild">
         <MSBuild Projects="FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj" Targets="Rebuild" />
-        <MSBuild Projects="FSharp.SDK\FSharp.SDK.wixproj" Targets="Rebuild" Properties="Lang=%(SetupLanguages.Identity)"/>
+        <MSBuild Projects="FSharp.SDK\FSharp.SDK.wixproj" Targets="Rebuild" Properties="Lang=%(SetupLanguages.Identity)"/>        
+        <MSBuild Projects="Insertion\FSharp.SDK\FSharp.SDK.swixproj" Targets="Rebuild" />
+        <MSBuild Projects="Insertion\VisualFSharpVSIX\VisualFSharpVSIX.swixproj" Targets="Rebuild" />
+        <MSBuild Projects="Insertion\Insertion.vsmanproj" Targets="Rebuild" />
     </Target>
     
     <Target Name="Clean">
         <MSBuild Projects="FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj" Targets="Clean" />
-        <MSBuild Projects="FSharp.SDK\FSharp.SDK.wixproj" Targets="Clean" Properties="Lang=%(SetupLanguages.Identity)"/>
+        <MSBuild Projects="FSharp.SDK\FSharp.SDK.wixproj" Targets="Clean" Properties="Lang=%(SetupLanguages.Identity)"/>        
+        <MSBuild Projects="Insertion\FSharp.SDK\FSharp.SDK.swixproj" Targets="Clean" />
+        <MSBuild Projects="Insertion\VisualFSharpVSIX\VisualFSharpVSIX.swixproj" Targets="Clean" />
+        <MSBuild Projects="Insertion\Insertion.vsmanproj" Targets="Clean" />
     </Target>
     
     <Target Name="CopyLocalizationResources" BeforeTargets="Build">
diff --git a/vsintegration/VisualFSharpVsix/VisualFSharpVsix.csproj b/vsintegration/VisualFSharpVsix/VisualFSharpVsix.csproj
index dc8d290d9f5..f9cc3eccbf8 100644
--- a/vsintegration/VisualFSharpVsix/VisualFSharpVsix.csproj
+++ b/vsintegration/VisualFSharpVsix/VisualFSharpVsix.csproj
@@ -344,6 +344,6 @@
     <ItemGroup>
         <VsixPath Include="$(OutDir)$(AssemblyName).vsix" />
     </ItemGroup>
-    <Copy SourceFiles="@(VsixPath)" DestinationFiles="@(VsixPath->'$(FSharpSourcesRoot)\..\$(Configuration)\insertion\%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(VsixPath)" DestinationFiles="@(VsixPath->'$(FSharpSourcesRoot)\..\$(Configuration)\insertion\vsix\%(Filename)%(Extension)')" />
   </Target>
 </Project>
\ No newline at end of file

From e6821c1322d68945c9ac6eec574626f0c718cff6 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Tue, 7 Jun 2016 12:42:38 -0700
Subject: [PATCH 3/3] Build VSIX after signing is complete

---
 build-everything.proj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-everything.proj b/build-everything.proj
index 41b691c8dc9..f35cbd05964 100644
--- a/build-everything.proj
+++ b/build-everything.proj
@@ -21,7 +21,6 @@
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
     <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
-    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -37,8 +36,9 @@
     <ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'" />
   </ItemGroup>
 
-  <ItemGroup>
-    <SetupProjects Include="setup/fsharp-setup-build.proj" Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'" />
+  <ItemGroup Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'">
+    <SetupProjects Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
+    <SetupProjects Include="setup/fsharp-setup-build.proj" />
   </ItemGroup>
   
   <Target Name="Build">
@@ -48,7 +48,7 @@
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
     <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
-    <MSBuild Projects="@(SetupProjects)"                 Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Build" BuildInParallel="false"  Properties="Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="Rebuild">
@@ -58,7 +58,7 @@
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
     <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
-    <MSBuild Projects="@(SetupProjects)"                 Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Rebuild" BuildInParallel="false"  Properties="Configuration=$(Configuration)" />
   </Target>
 
   <Target Name="Clean">
@@ -68,6 +68,6 @@
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
     <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
     <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
-    <MSBuild Projects="@(SetupProjects)"                 Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="@(SetupProjects)"                 Targets="Clean" BuildInParallel="false"  Properties="Configuration=$(Configuration)" />
   </Target>
 </Project>