From c013cbe6c33f45db4299f50e86b861927befb3e6 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Tue, 4 Oct 2016 17:48:04 -0700
Subject: [PATCH 1/5] Upgrade MSI swix build to produce UpgradeCode and
 InstallSize

---
 packages.config                                               | 2 +-
 setup/FSharp.SDK/FSharp.SDK.wixproj                           | 2 +-
 .../Microsoft.FSharp.Dependencies.swixproj                    | 4 ++++
 setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr                | 1 +
 .../Microsoft.FSharp.SDK.Core.swixproj                        | 4 ++++
 setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr           | 3 ++-
 setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr           | 1 +
 .../Microsoft.FSharp.SDK.Resources.swixproj                   | 1 +
 .../Microsoft.FSharp.Vsix.Core.swixproj                       | 1 +
 .../Microsoft.FSharp.Vsix.Resources.swixproj                  | 1 +
 10 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages.config b/packages.config
index 9cb25ccd79f..9d75ba0a3ca 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.43" />
+  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.60" />
   <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" />
diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
index d6d6d55da57..193e34b9494 100644
--- a/setup/FSharp.SDK/FSharp.SDK.wixproj
+++ b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -64,7 +64,7 @@
   <Import Project="$(WixInstallPath)\wix.targets" />
   <Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
 
-  <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
+  <Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
     <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." />
     <Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
index 2ba832036eb..83e29d1e2dc 100644
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
@@ -26,6 +26,10 @@
     <Package Include="Files.swr" />
     <Package Include="Dependencies.swr" />
   </ItemGroup>
+
+  <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
+    <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
+  </Target>
   
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
     <!-- SWIX plugin adds the built vsix to signing automatically -->
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr
index 03c9dab29b7..8ff8502480d 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr
@@ -3,6 +3,7 @@ use vs
 package name=Microsoft.FSharp.SDK.Core
         version=$(FSharpPackageVersion)
         vs.package.type=msi
+        vs.package.installSize=37223424
 
 vs.payloads
   vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi"
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
index de6979f0a7c..db0a4834c69 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
@@ -23,6 +23,10 @@
   <ItemGroup>
     <Package Include="Files.swr" />
   </ItemGroup>
+
+  <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
+    <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
+  </Target>
   
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
     <!-- MSI is already signed before wrapping it here -->
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
index fa3af6a1adb..59acd7de5b8 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
+++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
@@ -2,4 +2,5 @@ use vs
 
 package name=Microsoft.FSharp.SDK.Resources
         version=$(FSharpPackageVersion)
-        vs.package.language=$(LocaleSpecificCulture)
\ No newline at end of file
+        vs.package.language=$(LocaleSpecificCulture)
+        vs.package.installSize=0
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
index 5e7c02d2980..b1dfd59314b 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
@@ -4,6 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources
         version=$(FSharpPackageVersion)
         vs.package.type=msi
         vs.package.language=$(LocaleSpecificCulture)
+        vs.package.installSize=13854720
 
 vs.payloads
   vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi"
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
index a91de00cb73..62eef2efff7 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
@@ -44,5 +44,6 @@
     <Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
     <Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
     <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>
 </Project>
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
index 5f95bcfcfa6..5e9be797e6f 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
@@ -30,6 +30,7 @@
   </Target>
   
   <Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
+    <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
     <Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
   </Target>
 </Project>
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
index e2371d1d5d7..8fd11dd289c 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
@@ -46,5 +46,6 @@
     <Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
     <Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
     <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>
 </Project>

From f32857cdb87cba07701a76cf8a5b8ab3f498659d Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Wed, 5 Oct 2016 16:51:40 -0700
Subject: [PATCH 2/5] Depend on VsixInstaller package in F# v2 package

---
 setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
index 34048ab6dbb..6ca2bd6bda9 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
@@ -5,5 +5,8 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Core
         vs.package.type=vsix
         vs.package.vsixId=VisualFSharp
 
+vs.dependencies
+  vs.dependency id=Microsoft.VisualStudio.MinShell
+
 vs.payloads
-  vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"
\ No newline at end of file
+  vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"

From de872613a2f256df225a0030baa164e26cbf21b4 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 6 Oct 2016 12:30:41 -0700
Subject: [PATCH 3/5] Clean up initial targets

---
 setup/FSharp.SDK/FSharp.SDK.wixproj                          | 4 ++--
 .../Microsoft.FSharp.Dependencies.swixproj                   | 5 +++--
 .../Microsoft.FSharp.SDK.Core.swixproj                       | 5 +++--
 .../Microsoft.FSharp.SDK.Resources.swixproj                  | 5 +++--
 .../Microsoft.FSharp.Vsix.Core.swixproj                      | 5 +++--
 .../Microsoft.FSharp.Vsix.Resources.swixproj                 | 5 +++--
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
index 193e34b9494..e43a25db15d 100644
--- a/setup/FSharp.SDK/FSharp.SDK.wixproj
+++ b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+<Project InitialTargets="CheckPropertiesArePassed" ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
   <PropertyGroup>
     <FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
     <SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
@@ -64,7 +64,7 @@
   <Import Project="$(WixInstallPath)\wix.targets" />
   <Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
 
-  <Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
+  <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." />
     <Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
index 83e29d1e2dc..51f00b3cbf2 100644
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
     <OutputArchitecture>neutral</OutputArchitecture>
@@ -27,7 +28,7 @@
     <Package Include="Dependencies.swr" />
   </ItemGroup>
 
-  <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
+  <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
   </Target>
   
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
index db0a4834c69..ee9f0809268 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
     <OutputArchitecture>neutral</OutputArchitecture>
@@ -24,7 +25,7 @@
     <Package Include="Files.swr" />
   </ItemGroup>
 
-  <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
+  <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
   </Target>
   
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
index 62eef2efff7..834811d19f0 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
     <OutputArchitecture>neutral</OutputArchitecture>
@@ -38,7 +39,7 @@
     <!-- MSI is already signed before wrapping it here -->
   </Target>
   
-  <Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
+  <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." />
     <Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
index 5e9be797e6f..eaec6717052 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
     <OutputArchitecture>neutral</OutputArchitecture>
@@ -29,7 +30,7 @@
     <!-- SWIX plugin adds the built vsix to signing automatically -->
   </Target>
   
-  <Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
+  <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
     <Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
   </Target>
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
index 8fd11dd289c..29d998746f8 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- 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 InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
     <OutputArchitecture>neutral</OutputArchitecture>
@@ -39,7 +40,7 @@
     <!-- SWIX plugin adds the built vsix to signing automatically -->
   </Target>
   
-  <Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
+  <Target Name="CheckPropertiesArePassed">
     <Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
     <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." />

From 7f8ffb29271d002339d4c5713353e29caa25207d Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 6 Oct 2016 13:07:49 -0700
Subject: [PATCH 4/5] Fix zero sizes on other packs

---
 setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr  | 2 +-
 setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr      | 1 +
 setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
index 59acd7de5b8..43c529f030a 100644
--- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
+++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
@@ -3,4 +3,4 @@ use vs
 package name=Microsoft.FSharp.SDK.Resources
         version=$(FSharpPackageVersion)
         vs.package.language=$(LocaleSpecificCulture)
-        vs.package.installSize=0
+        vs.package.installSize=1
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
index 6ca2bd6bda9..ac8691655c7 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr
@@ -4,6 +4,7 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Core
         version=$(FSharpPackageVersion)
         vs.package.type=vsix
         vs.package.vsixId=VisualFSharp
+        vs.package.installSize=32108544
 
 vs.dependencies
   vs.dependency id=Microsoft.VisualStudio.MinShell
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr
index 2203e272e19..1fbe4e66ed7 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr
@@ -3,3 +3,4 @@ use vs
 package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
         version=$(FSharpPackageVersion)
         vs.package.language=$(LocaleSpecificCulture)
+        vs.package.installSize=1

From cc0525f3c8f0e267cb1ab84be38c2593f32591e7 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 6 Oct 2016 14:30:57 -0700
Subject: [PATCH 5/5] Fix Rebuild not found target error

---
 setup/fsharp-setup-build.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj
index 85b6ffb1dad..4041b8bab90 100644
--- a/setup/fsharp-setup-build.proj
+++ b/setup/fsharp-setup-build.proj
@@ -78,9 +78,9 @@
     </Target>
 
     <Target Name="Build" DependsOnTargets="CollectSetupProjects">
-        <!-- Wix targets files doesn't handle localization parameters correctly. Rebuilding all to clean obj files between languages -->
+        <!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages -->
         <MSBuild Projects="%(SetupProjects.ProjectPath)"
-                 Targets="Rebuild"
+                 Targets="Clean;Build"
                  Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleParentCulture=%(SetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SetupProjects.LocaleSpecificCulture);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/>
     </Target>