Upgrade MSI swix build to produce UpgradeCode and InstallSize

Author: Omar Tawfik

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

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

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

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"

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

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)
+        vs.package.language=$(LocaleSpecificCulture)
+        vs.package.installSize=0

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"

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>

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>

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>