Fixed selectable package dependencies

Author: Omar Tawfik

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=$(SwixPackageLanguage)
+        vs.package.language=$(LocaleRegion)
 
 vs.payloads
   vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.$(LocaleCode).msi"

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

@@ -15,21 +15,21 @@
   <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>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
   <ItemGroup>
     <Package Include="Files.swr" />
   </ItemGroup>
 
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+    <!-- MSI is already signed before wrapping it here -->
+  </Target>
+  
   <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." />

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

@@ -8,7 +8,7 @@ package name=Microsoft.FSharp.VSIX.$(VSSku)
 vs.dependencies
   vs.dependency id=Microsoft.FSharp.LangPack.$(VSSku)
                 version=4.1
-                type=Optional
+                type=Required
 
   vs.dependency id=Microsoft.FSharp.Dependencies
                 version=4.1