Make language packs optional

Author: Omar Tawfik

setup/Swix/Microsoft.FSharp.Dependencies/Files.swr

@@ -2,7 +2,7 @@ use vs
 
 package name=Microsoft.FSharp.Dependencies
         version=4.1
-        vs.package.language=en-us
+        vs.package.language=neutral
 
 folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
   file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"

setup/Swix/Microsoft.FSharp.SDK/Files.swr

@@ -3,7 +3,7 @@ use vs
 package name=Microsoft.FSharp.SDK
         version=4.1
         vs.package.type=msi
-        vs.package.language=$(LocaleRegion)
+        vs.package.language=$(SwixPackageLanguage)
 
 vs.payloads
   vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.$(LocaleCode).msi"

setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj

@@ -15,10 +15,15 @@
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
 
   <PropertyGroup>
+    <SwixPackageLanguage Condition="'$(IsLangPack)' == 'true'">$(LocaleRegion)</SwixPackageLanguage>
+    <SwixPackageLanguage Condition="'$(IsLangPack)' == 'false'">neutral</SwixPackageLanguage>
+    
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>    
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);SwixPackageLanguage=$(SwixPackageLanguage)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,5 +34,6 @@
     <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="'$(LocaleRegion)' == ''" Text="A 'LocaleRegion' property must be passed to the project." />
+    <Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
   </Target>
 </Project>

setup/Swix/Microsoft.FSharp.Vsix/Files.swr

@@ -3,12 +3,12 @@ use vs
 package name=Microsoft.FSharp.VSIX.$(VSSku)
         version=4.1
         vs.package.type=vsix
-        vs.package.language=en-us
+        vs.package.language=neutral
 
 vs.dependencies
   vs.dependency id=Microsoft.FSharp.LangPack.$(VSSku)
                 version=4.1
-                type=Required
+                type=Optional
 
   vs.dependency id=Microsoft.FSharp.Dependencies
                 version=4.1