Merge pull request #1575 from OmarTawfik/build-setup

Build setup in AppVeyor/Jenkins

Author: OmarTawfik

.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>  

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

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.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" />

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>