Fix localization by producing core + resources packages

setup/FSharp.SDK/FSharp.SDK.wixproj

@@ -10,7 +10,8 @@
   <Import Project="$(SetupRootFolder)\FSharp.Setup.props" />
 
   <PropertyGroup>
-    <OutputName>Microsoft.FSharp.SDK</OutputName>
+    <OutputName Condition="'$(IsLangPack)' == 'false'">Microsoft.FSharp.SDK.Core</OutputName>
+    <OutputName Condition="'$(IsLangPack)' == 'true'">Microsoft.FSharp.SDK.Resources.$(LocaleCode)</OutputName>
     <ProjectGuid>da0da41f-0e00-4598-8eee-b29d31b0ca04</ProjectGuid>
     <OutputType>Package</OutputType>
     <Media>net</Media>
@@ -74,6 +75,6 @@
         <MsiPath Include="$(OutDir)$(OutputName).msi" />
     </ItemGroup>
   
-    <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\msi\%(Filename).$(LocaleCode)%(Extension)')" />
+    <Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\msi\%(Filename)%(Extension)')" />
   </Target>
 </Project>
\ No newline at end of file

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

+use vs
+
+package name=Microsoft.FSharp.Dependencies
+        version=4.1
+
+vs.dependencies
+  vs.dependency id=Microsoft.FSharp.SDK.Core
+                version=4.1
+                type=Required
+  
+  vs.dependency id=Microsoft.FSharp.SDK.Resources
+                version=4.1
+                type=Required
+                
+  vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
+                version=4.1
+                type=Required
+                when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
+                
+  vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources
+                version=4.1
+                type=Required
+                when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
+                
+  vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Core
+                version=4.1
+                type=Required
+                when=Microsoft.VisualStudio.Product.DesktopExpress
+                
+  vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Resources
+                version=4.1
+                type=Required
+                when=Microsoft.VisualStudio.Product.DesktopExpress
+                
+  vs.dependency id=Microsoft.FSharp.VSIX.Web.Core
+                version=4.1
+                type=Required
+                when=Microsoft.VisualStudio.Product.WebExpress
+                
+  vs.dependency id=Microsoft.FSharp.VSIX.Web.Resources
+                version=4.1
+                type=Required
+                when=Microsoft.VisualStudio.Product.WebExpress

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

 use vs
 
-package name=Microsoft.FSharp.Dependencies.$(VSSku)
+package name=Microsoft.FSharp.Dependencies
         version=4.1
-        vs.package.language=neutral
-
-vs.dependencies
-  vs.dependency id=Microsoft.FSharp.VSIX.$(VSSku)
-                version=4.1
-                type=Required
-  
-  vs.dependency id=Microsoft.FSharp.SDK
-                version=4.1
-                type=Required
 
 folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp"
   file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"

setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj

@@ -10,7 +10,7 @@
     <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
     <PackagesFolder>$(FSharpSourcesRoot)\..\packages</PackagesFolder>
     <OutputPath>$(BinariesFolder)\insertion</OutputPath>
-    <OutputName>Microsoft.FSharp.Dependencies.$(VSSku)</OutputName>
+    <OutputName>Microsoft.FSharp.Dependencies</OutputName>
     <IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
   </PropertyGroup>
 
@@ -19,18 +19,14 @@
   <PropertyGroup>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VSSku=$(VSSku)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
   <ItemGroup>
     <Package Include="Files.swr" />
+    <Package Include="Dependencies.swr" />
   </ItemGroup>
   
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
     <!-- SWIX plugin adds the built vsix to signing automatically -->
   </Target>
-  
-  <Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
-    <Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
-  </Target>
 </Project>

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

+use vs
+
+package name=Microsoft.FSharp.SDK.Core
+        version=4.1
+        vs.package.type=msi
+
+vs.payloads
+  vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi"

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

+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
+    <OutputArchitecture>neutral</OutputArchitecture>
+    <OutputLocalized>false</OutputLocalized>
+    <OutputType>manifest</OutputType>
+    <OutputName>Microsoft.FSharp.SDK.Core</OutputName>
+    <IsPackage>true</IsPackage>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
+    <OutputPath>$(BinariesFolder)\insertion</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
+
+  <PropertyGroup>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Package Include="Files.swr" />
+  </ItemGroup>
+  
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+    <!-- MSI is already signed before wrapping it here -->
+  </Target>
+</Project>

setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr

+use vs
+
+package name=Microsoft.FSharp.SDK.Resources
+        version=4.1
+        vs.package.type=msi
+        vs.package.language=$(LocaleRegion)
\ No newline at end of file

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

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

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

@@ -5,7 +5,7 @@
     <OutputArchitecture>neutral</OutputArchitecture>
     <OutputLocalized>false</OutputLocalized>
     <OutputType>manifest</OutputType>
-    <OutputName>Microsoft.FSharp.SDK.$(LocaleCode)</OutputName>
+    <OutputName>Microsoft.FSharp.SDK.Resources.$(LocaleCode)</OutputName>
     <IsPackage>true</IsPackage>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
@@ -22,7 +22,11 @@
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsLangPack)' == 'false'">
+    <Package Include="Empty.swr" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsLangPack)' == 'true'">
     <Package Include="Files.swr" />
   </ItemGroup>
   

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

 use vs
 
-package name=Microsoft.FSharp.VSIX.$(VSSku)
+package name=Microsoft.FSharp.VSIX.$(VSSku).Core
         version=4.1
         vs.package.type=vsix
-        vs.package.language=$(LocaleRegion)
         vs.package.vsixId=VisualFSharp
 
 vs.payloads

setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
+    <OutputArchitecture>neutral</OutputArchitecture>
+    <OutputLocalized>false</OutputLocalized>
+    <IsPackage>true</IsPackage>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
+    <OutputPath>$(BinariesFolder)\insertion</OutputPath>
+    <OutputName>Microsoft.FSharp.VSIX.$(VSSku).Core</OutputName>
+    <IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
+    <OutputType>manifest</OutputType>
+  </PropertyGroup>
+  
+  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
+
+  <PropertyGroup>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VSSku=$(VSSku)</PackagePreprocessorDefinitions>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Package Include="Files.swr" />
+  </ItemGroup>
+  
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+    <!-- SWIX plugin adds the built vsix to signing automatically -->
+  </Target>
+  
+  <Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
+    <Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
+  </Target>
+</Project>

setup/Swix/Microsoft.FSharp.Vsix/LangPack.Desktop.Templates.swr → setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr

 use vs
 
-package name=Microsoft.FSharp.VSIX.$(VSSku)
+package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
         version=4.1
         vs.package.language=$(LocaleRegion)
 

setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr

+use vs
+
+package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
+        version=4.1
+        vs.package.language=$(LocaleRegion)

setup/Swix/Microsoft.FSharp.Vsix/LangPack.Files.swr → setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr

 use vs
 
-package name=Microsoft.FSharp.VSIX.$(VSSku)
+package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
         version=4.1
         vs.package.language=$(LocaleRegion)
 

setup/Swix/Microsoft.FSharp.Vsix/LangPack.Full.Templates.swr → setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr

 use vs
 
-package name=Microsoft.FSharp.VSIX.$(VSSku)
+package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
         version=4.1
         vs.package.language=$(LocaleRegion)
 

setup/Swix/Microsoft.FSharp.Vsix/Microsoft.FSharp.Vsix.swixproj → setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj

@@ -8,18 +8,11 @@
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
     <OutputPath>$(BinariesFolder)\insertion</OutputPath>
-    <OutputName>Microsoft.FSharp.VSIX.$(VSSku).$(LocaleCode)</OutputName>
+    <OutputName>Microsoft.FSharp.VSIX.$(VSSku).Resources.$(LocaleCode)</OutputName>
     <IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(IsLangPack)' == 'false'">
-    <OutputType>manifest</OutputType>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(IsLangPack)' == 'true'">
     <OutputType>vsix</OutputType>
   </PropertyGroup>
-
+  
   <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
 
   <PropertyGroup>
@@ -30,14 +23,14 @@
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
   </PropertyGroup>
-
+  
   <ItemGroup Condition="'$(IsLangPack)' == 'false'">
-    <Package Include="Core.Files.swr" />
+    <Package Include="Empty.swr" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(IsLangPack)' == 'true'">
-    <Package Include="LangPack.Files.swr" />
-    <Package Include="LangPack.$(VSSku).Templates.swr" />
+    <Package Include="Files.swr" />
+    <Package Include="$(VSSku).Templates.swr" />
   </ItemGroup>
   
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">

setup/Swix/Microsoft.FSharp.Vsix/LangPack.Web.Templates.swr → setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr

 use vs
 
-package name=Microsoft.FSharp.VSIX.$(VSSku)
+package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
         version=4.1
         vs.package.language=$(LocaleRegion)
 

setup/Swix/Microsoft.FSharp.vsmanproj

@@ -15,13 +15,19 @@
   
     <Target Name="IncludeManifests" BeforeTargets="MergeManifests">
         <ItemGroup>
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.%(SetupLanguages.LocaleCode).json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.%(SetupLanguages.LocaleCode).json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Desktop.%(SetupLanguages.LocaleCode).json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Web.%(SetupLanguages.LocaleCode).json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.Full.json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.Desktop.json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.Web.json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Core.json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json" />
+            
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json" />
+            
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Desktop.Core.json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Desktop.Resources.%(SetupLanguages.LocaleCode).json" />
+            
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Web.Core.json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Web.Resources.%(SetupLanguages.LocaleCode).json" />
+            
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
         </ItemGroup>
     </Target>
 </Project>
\ No newline at end of file

setup/fsharp-setup-build.proj

@@ -15,54 +15,61 @@
         <ItemGroup>
             <SetupProjects Include="FSharp.Wix.Extensions.csproj">
                 <ProjectPath>FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj</ProjectPath>
-            </SetupProjects>            
+            </SetupProjects>
         </ItemGroup>
         
         <CreateItem Include="@(SetupLanguages)"
                     AdditionalMetadata="ProjectPath=FSharp.SDK\FSharp.SDK.wixproj">
-            <Output ItemName="SetupProjects"
-                    TaskParameter="Include"/>
+            <Output ItemName="SetupProjects" TaskParameter="Include"/>
         </CreateItem>
         
+        <ItemGroup>
+            <SetupProjects Include="Microsoft.FSharp.SDK.Core.swixproj">
+                <ProjectPath>Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj</ProjectPath>
+            </SetupProjects>
+        </ItemGroup>
+        
         <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK\Microsoft.FSharp.SDK.swixproj">
-            <Output ItemName="SetupProjects"
-                    TaskParameter="Include"/>
+                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK.Resources\Microsoft.FSharp.SDK.Resources.swixproj">
+            <Output ItemName="SetupProjects" TaskParameter="Include"/>
         </CreateItem>     
         
+        <ItemGroup>
+            <SetupProjects Include="Microsoft.FSharp.Vsix.Core.swixproj">
+                <ProjectPath>Swix\Microsoft.FSharp.Vsix.Core\Microsoft.FSharp.Vsix.Core.swixproj</ProjectPath>
+                <VSSku>Full</VSSku>
+            </SetupProjects>
+            
+            <SetupProjects Include="Microsoft.FSharp.Vsix.Core.swixproj">
+                <ProjectPath>Swix\Microsoft.FSharp.Vsix.Core\Microsoft.FSharp.Vsix.Core.swixproj</ProjectPath>
+                <VSSku>Desktop</VSSku>
+            </SetupProjects>
+            
+            <SetupProjects Include="Microsoft.FSharp.Vsix.Core.swixproj">
+                <ProjectPath>Swix\Microsoft.FSharp.Vsix.Core\Microsoft.FSharp.Vsix.Core.swixproj</ProjectPath>
+                <VSSku>Web</VSSku>
+            </SetupProjects>
+        </ItemGroup>
+        
         <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj;VSSku=Full">
-            <Output ItemName="SetupProjects"
-                    TaskParameter="Include"/>
+                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Full">
+            <Output ItemName="SetupProjects" TaskParameter="Include"/>
         </CreateItem>
         
         <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj;VSSku=Desktop">
-            <Output ItemName="SetupProjects"
-                    TaskParameter="Include"/>
+                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Desktop">
+            <Output ItemName="SetupProjects" TaskParameter="Include"/>
         </CreateItem>
         
         <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj;VSSku=Web">
-            <Output ItemName="SetupProjects"
-                    TaskParameter="Include"/>
+                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Web">
+            <Output ItemName="SetupProjects" TaskParameter="Include"/>
         </CreateItem>
         
         <ItemGroup>
             <SetupProjects Include="Microsoft.FSharp.Dependencies.swixproj">
                 <ProjectPath>Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj</ProjectPath>
-                <VSSku>Full</VSSku>
-            </SetupProjects>          
-
-            <SetupProjects Include="Microsoft.FSharp.Dependencies.swixproj">
-                <ProjectPath>Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj</ProjectPath>
-                <VSSku>Desktop</VSSku>
-            </SetupProjects>     
-
-            <SetupProjects Include="Microsoft.FSharp.Dependencies.swixproj">
-                <ProjectPath>Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj</ProjectPath>
-                <VSSku>Web</VSSku>
-            </SetupProjects>                 
+            </SetupProjects>
             
             <SetupProjects Include="Microsoft.FSharp.vsmanproj">
                 <ProjectPath>Swix\Microsoft.FSharp.vsmanproj</ProjectPath>