Merge pull request #1500 from OmarTawfik/fixsetup

Fix setup localization + paths
dotnet · Sep 21, 2016 · bcf53a9 · bcf53a9
2 parents ca69e01 + 87bf48a
commit bcf53a9
Show file tree

Hide file tree

Showing 27 changed files with 701 additions and 139 deletions.
diff --git a/VisualFSharp.sln b/VisualFSharp.sln
@@ -1,9 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.25302.0
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 15.0.25618.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
 EndProject
@@ -131,6 +129,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpFull", "vsinteg
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpWeb", "vsintegration\Vsix\VisualFSharpWeb\VisualFSharpWeb.csproj", "{58730C8B-16F5-4956-9291-BB68E17C9142}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpOpenSource", "vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj", "{E6A45CDF-B408-420F-B475-74611BEFC52B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -728,6 +728,18 @@ Global
 		{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.Build.0 = Release|Any CPU
 		{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.ActiveCfg = Release|Any CPU
 		{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.Build.0 = Release|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0 = Proto|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg = Proto|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0 = Proto|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -787,5 +799,6 @@ Global
 		{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
 		{59ADCE46-9740-4079-834D-9A03A3494EBC} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
 		{58730C8B-16F5-4956-9291-BB68E17C9142} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
+		{E6A45CDF-B408-420F-B475-74611BEFC52B} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
 	EndGlobalSection
 EndGlobal
diff --git a/setup/FSharp.SDK/Common.Wix.Properties.wxs b/setup/FSharp.SDK/Common.Wix.Properties.wxs
@@ -12,64 +12,64 @@
               <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework" Name=".NETFramework">
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0" Name="v4.0">
                   <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0" Name="4.4.1.0">
-                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                   </Directory>
                   <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0" Name="4.4.0.0">
-                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                   </Directory>
                   <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0" Name="4.3.1.0">
-                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                   </Directory>
                   <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0" Name="4.3.0.0">
-                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                    <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                   </Directory>
                 </Directory>
               </Directory>
 
               <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable" Name=".NETPortable">
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0" Name="3.47.41.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0" Name="3.47.4.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1" Name="2.3.5.1">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0" Name="2.3.5.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
               </Directory>
 
               <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore" Name=".NETCore">
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0" Name="3.7.41.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0" Name="3.7.4.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0" Name="3.3.1.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
 
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0" Name="3.78.41.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0" Name="3.78.4.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1" Name="3.78.3.1">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
 
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0" Name="3.259.41.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0" Name="3.259.4.0">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
                 <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1" Name="3.259.3.1">
-                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
               </Directory>
             </Directory>
@@ -81,7 +81,7 @@
             <Directory Id="MicrosoftSDKs_FS_4.1" Name="4.1">
               <Directory Id="MicrosoftSDKs_FS_4.1_Framework" Name="Framework">
                 <Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0">
-                  <Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
+                  <Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
                 </Directory>
               </Directory>
             </Directory>

diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/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)' != 'true'">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>
@@ -23,7 +24,8 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
     <DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
-    <DefineConstants>$(DefineConstants);LocaleRegion=$(LocaleRegion)</DefineConstants>
+    <DefineConstants>$(DefineConstants);LocaleParentCulture=$(LocaleParentCulture)</DefineConstants>
+    <DefineConstants>$(DefineConstants);LocaleSpecificCulture=$(LocaleSpecificCulture)</DefineConstants>
     <DefineConstants>$(DefineConstants);IsLangPack=$(IsLangPack)</DefineConstants>
 
     <DefineConstants>$(DefineConstants);BinariesDir=$(BinariesDir)</DefineConstants>
@@ -65,7 +67,8 @@
   <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
     <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="'$(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." />
   </Target>
 
@@ -74,6 +77,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>
diff --git a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs
@@ -4,7 +4,7 @@
 
   <Fragment>
     <?define LangLCID = $(var.LocaleId) ?>
-    <?define LangCulture = $(var.LocaleRegion) ?>
+    <?define LangCulture = $(var.LocaleSpecificCulture) ?>
 
     <ComponentGroup Id="Runtime_LangPack">
 

diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props
@@ -4,6 +4,7 @@
     <PropertyGroup>
         <SchemaVersion>2.0</SchemaVersion>
         <ProductVersion>3.10</ProductVersion>
+        <FSharpPackageVersion>4.1</FSharpPackageVersion>
         <WiXToolset2015Version>3.10.0.1503</WiXToolset2015Version>
         <WixInstallPath>$(SetupRootFolder)\..\packages\WiX.Toolset.2015.$(WiXToolset2015Version)\tools\wix</WixInstallPath>
         <NugetPackagesDir>$(SetupRootFolder)\..\packages</NugetPackagesDir>
@@ -26,85 +27,99 @@
         <SetupLanguages Include="ENU">
             <LocaleCode>ENU</LocaleCode>
             <LocaleId>1033</LocaleId>
-            <LocaleRegion>en-us</LocaleRegion>
+            <LocaleParentCulture>en</LocaleParentCulture>
+            <LocaleSpecificCulture>en-US</LocaleSpecificCulture>
             <IsLangPack>false</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="CHT" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>CHT</LocaleCode>
             <LocaleId>1028</LocaleId>
-            <LocaleRegion>zh-tw</LocaleRegion>
+            <LocaleParentCulture>zh-Hant</LocaleParentCulture>
+            <LocaleSpecificCulture>zh-TW</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="CSY" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>CSY</LocaleCode>
             <LocaleId>1029</LocaleId>
-            <LocaleRegion>cs-cz</LocaleRegion>
+            <LocaleParentCulture>cs</LocaleParentCulture>
+            <LocaleSpecificCulture>cs-CZ</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="DEU" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>DEU</LocaleCode>
             <LocaleId>1031</LocaleId>
-            <LocaleRegion>de-de</LocaleRegion>
+            <LocaleParentCulture>de</LocaleParentCulture>
+            <LocaleSpecificCulture>de-DE</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="FRA" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>FRA</LocaleCode>
             <LocaleId>1036</LocaleId>
-            <LocaleRegion>fr-fr</LocaleRegion>
+            <LocaleParentCulture>fr</LocaleParentCulture>
+            <LocaleSpecificCulture>fr-FR</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="ITA" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>ITA</LocaleCode>
             <LocaleId>1040</LocaleId>
-            <LocaleRegion>it-it</LocaleRegion>
+            <LocaleParentCulture>it</LocaleParentCulture>
+            <LocaleSpecificCulture>it-IT</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="JPN" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>JPN</LocaleCode>
             <LocaleId>1041</LocaleId>
-            <LocaleRegion>ja-jp</LocaleRegion>
+            <LocaleParentCulture>ja</LocaleParentCulture>
+            <LocaleSpecificCulture>ja-JP</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="KOR" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>KOR</LocaleCode>
             <LocaleId>1042</LocaleId>
-            <LocaleRegion>ko-kr</LocaleRegion>
+            <LocaleParentCulture>ko</LocaleParentCulture>
+            <LocaleSpecificCulture>ko-KR</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="PLK" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>PLK</LocaleCode>
             <LocaleId>1045</LocaleId>
-            <LocaleRegion>pl-pl</LocaleRegion>
+            <LocaleParentCulture>pl</LocaleParentCulture>
+            <LocaleSpecificCulture>pl-PL</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="PTB" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>PTB</LocaleCode>
             <LocaleId>1046</LocaleId>
-            <LocaleRegion>pt-br</LocaleRegion>
+            <LocaleParentCulture>pt-BR</LocaleParentCulture>
+            <LocaleSpecificCulture>pt-BR</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="RUS" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>RUS</LocaleCode>
             <LocaleId>1049</LocaleId>
-            <LocaleRegion>ru-ru</LocaleRegion>
+            <LocaleParentCulture>ru</LocaleParentCulture>
+            <LocaleSpecificCulture>ru-RU</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="TRK" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>TRK</LocaleCode>
             <LocaleId>1055</LocaleId>
-            <LocaleRegion>tr-tr</LocaleRegion>
+            <LocaleParentCulture>tr</LocaleParentCulture>
+            <LocaleSpecificCulture>tr-TR</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="CHS" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>CHS</LocaleCode>
             <LocaleId>2052</LocaleId>
-            <LocaleRegion>zh-cn</LocaleRegion>
+            <LocaleParentCulture>zh-Hans</LocaleParentCulture>
+            <LocaleSpecificCulture>zh-CN</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
         <SetupLanguages Include="ESN" Condition="'$(LocLanguages)' != ''">
             <LocaleCode>ESN</LocaleCode>
             <LocaleId>3082</LocaleId>
-            <LocaleRegion>es-es</LocaleRegion>
+            <LocaleParentCulture>es</LocaleParentCulture>
+            <LocaleSpecificCulture>es-ES</LocaleSpecificCulture>
             <IsLangPack>true</IsLangPack>
         </SetupLanguages>
     </ItemGroup>