Skip to content

Commit e5c0230

Browse files
author
Omar Tawfik
committed
Fixed Sattelite Assemblies folder names
1 parent acf614e commit e5c0230

File tree

14 files changed

+72
-52
lines changed

14 files changed

+72
-52
lines changed

‎setup/FSharp.SDK/Common.Wix.Properties.wxs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,64 @@
1212
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework" Name=".NETFramework">
1313
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0" Name="v4.0">
1414
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0" Name="4.4.1.0">
15-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
15+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
1616
</Directory>
1717
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0" Name="4.4.0.0">
18-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
18+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
1919
</Directory>
2020
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0" Name="4.3.1.0">
21-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
21+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
2222
</Directory>
2323
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0" Name="4.3.0.0">
24-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
24+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
2525
</Directory>
2626
</Directory>
2727
</Directory>
2828

2929
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable" Name=".NETPortable">
3030
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0" Name="3.47.41.0">
31-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
31+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
3232
</Directory>
3333
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0" Name="3.47.4.0">
34-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
34+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
3535
</Directory>
3636
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1" Name="2.3.5.1">
37-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
37+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
3838
</Directory>
3939
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0" Name="2.3.5.0">
40-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
40+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
4141
</Directory>
4242
</Directory>
4343

4444
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore" Name=".NETCore">
4545
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0" Name="3.7.41.0">
46-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
46+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
4747
</Directory>
4848
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0" Name="3.7.4.0">
49-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
49+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
5050
</Directory>
5151
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0" Name="3.3.1.0">
52-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
52+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
5353
</Directory>
5454

5555
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0" Name="3.78.41.0">
56-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
56+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
5757
</Directory>
5858
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0" Name="3.78.4.0">
59-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
59+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
6060
</Directory>
6161
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1" Name="3.78.3.1">
62-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
62+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
6363
</Directory>
6464

6565
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0" Name="3.259.41.0">
66-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
66+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
6767
</Directory>
6868
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0" Name="3.259.4.0">
69-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
69+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
7070
</Directory>
7171
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1" Name="3.259.3.1">
72-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
72+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
7373
</Directory>
7474
</Directory>
7575
</Directory>
@@ -81,7 +81,7 @@
8181
<Directory Id="MicrosoftSDKs_FS_4.1" Name="4.1">
8282
<Directory Id="MicrosoftSDKs_FS_4.1_Framework" Name="Framework">
8383
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0">
84-
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
84+
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
8585
</Directory>
8686
</Directory>
8787
</Directory>

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
<PropertyGroup>
2525
<DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
2626
<DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
27-
<DefineConstants>$(DefineConstants);LocaleRegion=$(LocaleRegion)</DefineConstants>
27+
<DefineConstants>$(DefineConstants);LocaleParentCulture=$(LocaleParentCulture)</DefineConstants>
28+
<DefineConstants>$(DefineConstants);LocaleSpecificCulture=$(LocaleSpecificCulture)</DefineConstants>
2829
<DefineConstants>$(DefineConstants);IsLangPack=$(IsLangPack)</DefineConstants>
2930

3031
<DefineConstants>$(DefineConstants);BinariesDir=$(BinariesDir)</DefineConstants>
@@ -66,7 +67,8 @@
6667
<Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
6768
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
6869
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
69-
<Error Condition="'$(LocaleRegion)' == ''" Text="A 'LocaleRegion' property must be passed to the project." />
70+
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
71+
<Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
7072
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
7173
</Target>
7274

‎setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<Fragment>
66
<?define LangLCID = $(var.LocaleId) ?>
7-
<?define LangCulture = $(var.LocaleRegion) ?>
7+
<?define LangCulture = $(var.LocaleSpecificCulture) ?>
88

99
<ComponentGroup Id="Runtime_LangPack">
1010

‎setup/FSharp.Setup.props‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,85 +27,99 @@
2727
<SetupLanguages Include="ENU">
2828
<LocaleCode>ENU</LocaleCode>
2929
<LocaleId>1033</LocaleId>
30-
<LocaleRegion>en-us</LocaleRegion>
30+
<LocaleParentCulture>en</LocaleParentCulture>
31+
<LocaleSpecificCulture>en-US</LocaleSpecificCulture>
3132
<IsLangPack>false</IsLangPack>
3233
</SetupLanguages>
3334
<SetupLanguages Include="CHT" Condition="'$(LocLanguages)' != ''">
3435
<LocaleCode>CHT</LocaleCode>
3536
<LocaleId>1028</LocaleId>
36-
<LocaleRegion>zh-tw</LocaleRegion>
37+
<LocaleParentCulture>zh-Hant</LocaleParentCulture>
38+
<LocaleSpecificCulture>zh-TW</LocaleSpecificCulture>
3739
<IsLangPack>true</IsLangPack>
3840
</SetupLanguages>
3941
<SetupLanguages Include="CSY" Condition="'$(LocLanguages)' != ''">
4042
<LocaleCode>CSY</LocaleCode>
4143
<LocaleId>1029</LocaleId>
42-
<LocaleRegion>cs-cz</LocaleRegion>
44+
<LocaleParentCulture>cs</LocaleParentCulture>
45+
<LocaleSpecificCulture>cs-CZ</LocaleSpecificCulture>
4346
<IsLangPack>true</IsLangPack>
4447
</SetupLanguages>
4548
<SetupLanguages Include="DEU" Condition="'$(LocLanguages)' != ''">
4649
<LocaleCode>DEU</LocaleCode>
4750
<LocaleId>1031</LocaleId>
48-
<LocaleRegion>de-de</LocaleRegion>
51+
<LocaleParentCulture>de</LocaleParentCulture>
52+
<LocaleSpecificCulture>de-DE</LocaleSpecificCulture>
4953
<IsLangPack>true</IsLangPack>
5054
</SetupLanguages>
5155
<SetupLanguages Include="FRA" Condition="'$(LocLanguages)' != ''">
5256
<LocaleCode>FRA</LocaleCode>
5357
<LocaleId>1036</LocaleId>
54-
<LocaleRegion>fr-fr</LocaleRegion>
58+
<LocaleParentCulture>fr</LocaleParentCulture>
59+
<LocaleSpecificCulture>fr-FR</LocaleSpecificCulture>
5560
<IsLangPack>true</IsLangPack>
5661
</SetupLanguages>
5762
<SetupLanguages Include="ITA" Condition="'$(LocLanguages)' != ''">
5863
<LocaleCode>ITA</LocaleCode>
5964
<LocaleId>1040</LocaleId>
60-
<LocaleRegion>it-it</LocaleRegion>
65+
<LocaleParentCulture>it</LocaleParentCulture>
66+
<LocaleSpecificCulture>it-IT</LocaleSpecificCulture>
6167
<IsLangPack>true</IsLangPack>
6268
</SetupLanguages>
6369
<SetupLanguages Include="JPN" Condition="'$(LocLanguages)' != ''">
6470
<LocaleCode>JPN</LocaleCode>
6571
<LocaleId>1041</LocaleId>
66-
<LocaleRegion>ja-jp</LocaleRegion>
72+
<LocaleParentCulture>ja</LocaleParentCulture>
73+
<LocaleSpecificCulture>ja-JP</LocaleSpecificCulture>
6774
<IsLangPack>true</IsLangPack>
6875
</SetupLanguages>
6976
<SetupLanguages Include="KOR" Condition="'$(LocLanguages)' != ''">
7077
<LocaleCode>KOR</LocaleCode>
7178
<LocaleId>1042</LocaleId>
72-
<LocaleRegion>ko-kr</LocaleRegion>
79+
<LocaleParentCulture>ko</LocaleParentCulture>
80+
<LocaleSpecificCulture>ko-KR</LocaleSpecificCulture>
7381
<IsLangPack>true</IsLangPack>
7482
</SetupLanguages>
7583
<SetupLanguages Include="PLK" Condition="'$(LocLanguages)' != ''">
7684
<LocaleCode>PLK</LocaleCode>
7785
<LocaleId>1045</LocaleId>
78-
<LocaleRegion>pl-pl</LocaleRegion>
86+
<LocaleParentCulture>pl</LocaleParentCulture>
87+
<LocaleSpecificCulture>pl-PL</LocaleSpecificCulture>
7988
<IsLangPack>true</IsLangPack>
8089
</SetupLanguages>
8190
<SetupLanguages Include="PTB" Condition="'$(LocLanguages)' != ''">
8291
<LocaleCode>PTB</LocaleCode>
8392
<LocaleId>1046</LocaleId>
84-
<LocaleRegion>pt-br</LocaleRegion>
93+
<LocaleParentCulture>pt-BR</LocaleParentCulture>
94+
<LocaleSpecificCulture>pt-BR</LocaleSpecificCulture>
8595
<IsLangPack>true</IsLangPack>
8696
</SetupLanguages>
8797
<SetupLanguages Include="RUS" Condition="'$(LocLanguages)' != ''">
8898
<LocaleCode>RUS</LocaleCode>
8999
<LocaleId>1049</LocaleId>
90-
<LocaleRegion>ru-ru</LocaleRegion>
100+
<LocaleParentCulture>ru</LocaleParentCulture>
101+
<LocaleSpecificCulture>ru-RU</LocaleSpecificCulture>
91102
<IsLangPack>true</IsLangPack>
92103
</SetupLanguages>
93104
<SetupLanguages Include="TRK" Condition="'$(LocLanguages)' != ''">
94105
<LocaleCode>TRK</LocaleCode>
95106
<LocaleId>1055</LocaleId>
96-
<LocaleRegion>tr-tr</LocaleRegion>
107+
<LocaleParentCulture>tr</LocaleParentCulture>
108+
<LocaleSpecificCulture>tr-TR</LocaleSpecificCulture>
97109
<IsLangPack>true</IsLangPack>
98110
</SetupLanguages>
99111
<SetupLanguages Include="CHS" Condition="'$(LocLanguages)' != ''">
100112
<LocaleCode>CHS</LocaleCode>
101113
<LocaleId>2052</LocaleId>
102-
<LocaleRegion>zh-cn</LocaleRegion>
114+
<LocaleParentCulture>zh-Hans</LocaleParentCulture>
115+
<LocaleSpecificCulture>zh-CN</LocaleSpecificCulture>
103116
<IsLangPack>true</IsLangPack>
104117
</SetupLanguages>
105118
<SetupLanguages Include="ESN" Condition="'$(LocLanguages)' != ''">
106119
<LocaleCode>ESN</LocaleCode>
107120
<LocaleId>3082</LocaleId>
108-
<LocaleRegion>es-es</LocaleRegion>
121+
<LocaleParentCulture>es</LocaleParentCulture>
122+
<LocaleSpecificCulture>es-ES</LocaleSpecificCulture>
109123
<IsLangPack>true</IsLangPack>
110124
</SetupLanguages>
111125
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ use vs
22

33
package name=Microsoft.FSharp.SDK.Resources
44
version=$(FSharpPackageVersion)
5-
vs.package.language=$(LocaleRegion)
5+
vs.package.language=$(LocaleSpecificCulture)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use vs
33
package name=Microsoft.FSharp.SDK.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.type=msi
6-
vs.package.language=$(LocaleRegion)
6+
vs.package.language=$(LocaleSpecificCulture)
77

88
vs.payloads
99
vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi"

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2121
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
2222
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
23-
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
24-
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion)</PackagePreprocessorDefinitions>
23+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
24+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
25+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)</PackagePreprocessorDefinitions>
2526
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
2627
</PropertyGroup>
2728

@@ -40,7 +41,8 @@
4041
<Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
4142
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
4243
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
43-
<Error Condition="'$(LocaleRegion)' == ''" Text="A 'LocaleRegion' property must be passed to the project." />
44+
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
45+
<Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
4446
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
4547
</Target>
4648
</Project>

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use vs
22

33
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
44
version=$(FSharpPackageVersion)
5-
vs.package.language=$(LocaleRegion)
5+
vs.package.language=$(LocaleSpecificCulture)
66

77
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject"
88
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ use vs
22

33
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
44
version=$(FSharpPackageVersion)
5-
vs.package.language=$(LocaleRegion)
5+
vs.package.language=$(LocaleSpecificCulture)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use vs
22

33
package name=Microsoft.FSharp.VSIX.$(VSSku).Resources
44
version=$(FSharpPackageVersion)
5-
vs.package.language=$(LocaleRegion)
5+
vs.package.language=$(LocaleSpecificCulture)
66

7-
folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleRegion)"
7+
folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleParentCulture)"
88
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
99

10-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleRegion)"
10+
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentCulture)"
1111
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.resources.dll" vs.file.ngen=yes
1212
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
1313
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.LanguageService.Base.resources.dll" vs.file.ngen=yes

0 commit comments

Comments
 (0)