From 726afc7fb35cc76c71ef6c5d3115c533b55d7b0a Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 29 Sep 2016 11:49:45 -0700
Subject: [PATCH 1/3] Pull swix plugin from myget

---
 .nuget/NuGet.Config | 1 +
 build.cmd           | 3 +++
 packages.config     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
index 9c6ed6cd8e7..834558675d7 100644
--- a/.nuget/NuGet.Config
+++ b/.nuget/NuGet.Config
@@ -10,6 +10,7 @@
     <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
+    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />  
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vctools" value="https://vcppdogfooding.azurewebsites.net/nuget/" />
   </packageSources>  
diff --git a/build.cmd b/build.cmd
index 9e856ae7a55..8928d27e0ad 100644
--- a/build.cmd
+++ b/build.cmd
@@ -96,6 +96,7 @@ if /i '%ARG%' == 'all' (
     set BUILD_CORECLR=1
     set BUILD_PORTABLE=1
     set BUILD_VS=1
+    set BUILD_SETUP=1
 
     set TEST_COMPILERUNIT=1
     set TEST_NET40_COREUNIT=1
@@ -142,6 +143,7 @@ if /i '%ARG%' == 'ci' (
     set BUILD_CORECLR=1
     set BUILD_PORTABLE=1
     set BUILD_VS=1
+    set BUILD_SETUP=1
 
     set TEST_COMPILERUNIT=1
     set TEST_NET40_COREUNIT=1
@@ -162,6 +164,7 @@ if /i '%ARG%' == 'ci_part1' (
     set BUILD_CORECLR=0
     set BUILD_PORTABLE=1
     set BUILD_VS=1
+    set BUILD_SETUP=1
 
     set TEST_COMPILERUNIT=1
     set TEST_NET40_COREUNIT=0
diff --git a/packages.config b/packages.config
index 6b37a9859c4..b276c1fbc46 100644
--- a/packages.config
+++ b/packages.config
@@ -13,6 +13,8 @@
   <package id="Microsoft.DiaSymReader" version="1.0.8" />
   <package id="FsSrGen" version="2.0.0" targetFramework="net46" />
   <package id="MicroBuild.Core" version="0.2.0" />
+  <package id="MicroBuild.Core.Sentinel" version="1.0.0" />
+  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.24" />
   <package id="WiX.Toolset.2015" version="3.10.0.1503" />
   <package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
   <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />

From 67386194a5bdd2d3f15da2ae83d8fb869b1c7f56 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 29 Sep 2016 13:21:09 -0700
Subject: [PATCH 2/3] Copy MSIs to insertion folder regardless of signing

---
 setup/FSharp.SDK/FSharp.SDK.wixproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
index 12843effde0..d6d6d55da57 100644
--- a/setup/FSharp.SDK/FSharp.SDK.wixproj
+++ b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -72,7 +72,7 @@
     <Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
   </Target>
 
-  <Target Name="CopyMsiToInsertionFolder" AfterTargets="SignFiles">
+  <Target Name="CopyMsiToInsertionFolder" AfterTargets="Build">
     <ItemGroup>
         <MsiPath Include="$(OutDir)$(OutputName).msi" />
     </ItemGroup>

From 705e8e485be81ca62339d2b89540171d6d216630 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 29 Sep 2016 15:09:47 -0700
Subject: [PATCH 3/3] Using newer version of swixbuild nuget

---
 packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages.config b/packages.config
index b276c1fbc46..9cb25ccd79f 100644
--- a/packages.config
+++ b/packages.config
@@ -14,7 +14,7 @@
   <package id="FsSrGen" version="2.0.0" targetFramework="net46" />
   <package id="MicroBuild.Core" version="0.2.0" />
   <package id="MicroBuild.Core.Sentinel" version="1.0.0" />
-  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.24" />
+  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.43" />
   <package id="WiX.Toolset.2015" version="3.10.0.1503" />
   <package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
   <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />