Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1bf7819

Browse files
committed
update remaining setup authoring for localization changes
1 parent997afd2 commit1bf7819

File tree

9 files changed

+45
-40
lines changed

9 files changed

+45
-40
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PropertyGroup>
2525
<DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
2626
<DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
27+
<DefineConstants>$(DefineConstants);LocaleParentId=$(LocaleParentId)</DefineConstants>
2728
<DefineConstants>$(DefineConstants);LocaleParentCulture=$(LocaleParentCulture)</DefineConstants>
2829
<DefineConstants>$(DefineConstants);LocaleSpecificCulture=$(LocaleSpecificCulture)</DefineConstants>
2930
<DefineConstants>$(DefineConstants);IsLangPack=$(IsLangPack)</DefineConstants>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,15 @@
175175
</Component>
176176

177177
<ComponentId="Compiler_Redist_System.Reflection.Metadata.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Reflection.Metadata.dll, $(var.LocaleCode)))">
178-
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\netstandard1.1\System.Reflection.Metadata.dll" />
178+
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.4.2\lib\netstandard1.1\System.Reflection.Metadata.dll" />
179179
</Component>
180180

181181
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll, $(var.LocaleCode)))">
182182
<FileId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" />
183183
</Component>
184184

185185
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.dll, $(var.LocaleCode)))">
186-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.0.8\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
186+
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
187187
</Component>
188188

189189
<ComponentId="Compiler_Redist_System.ValueTuple.dll"Guid="$(fsharp.guid(Compiler_Redist_System.ValueTuple.dll, $(var.LocaleCode)))">

‎setup/FSharp.Setup.props‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,97 +37,111 @@
3737
<SetupLanguagesInclude="ENU">
3838
<LocaleCode>ENU</LocaleCode>
3939
<LocaleId>1033</LocaleId>
40+
<LocaleParentId>9</LocaleParentId>
4041
<LocaleParentCulture>en</LocaleParentCulture>
4142
<LocaleSpecificCulture>en-US</LocaleSpecificCulture>
4243
<IsLangPack>false</IsLangPack>
4344
</SetupLanguages>
44-
<SetupLanguagesInclude="CHT"Condition="'$(LocLanguages)' != ''">
45+
<SetupLanguagesInclude="CHT">
4546
<LocaleCode>CHT</LocaleCode>
4647
<LocaleId>1028</LocaleId>
48+
<LocaleParentId>31748</LocaleParentId>
4749
<LocaleParentCulture>zh-Hant</LocaleParentCulture>
4850
<LocaleSpecificCulture>zh-TW</LocaleSpecificCulture>
4951
<IsLangPack>true</IsLangPack>
5052
</SetupLanguages>
51-
<SetupLanguagesInclude="CSY"Condition="'$(LocLanguages)' != ''">
53+
<SetupLanguagesInclude="CSY">
5254
<LocaleCode>CSY</LocaleCode>
5355
<LocaleId>1029</LocaleId>
56+
<LocaleParentId>5</LocaleParentId>
5457
<LocaleParentCulture>cs</LocaleParentCulture>
5558
<LocaleSpecificCulture>cs-CZ</LocaleSpecificCulture>
5659
<IsLangPack>true</IsLangPack>
5760
</SetupLanguages>
58-
<SetupLanguagesInclude="DEU"Condition="'$(LocLanguages)' != ''">
61+
<SetupLanguagesInclude="DEU">
5962
<LocaleCode>DEU</LocaleCode>
6063
<LocaleId>1031</LocaleId>
64+
<LocaleParentId>7</LocaleParentId>
6165
<LocaleParentCulture>de</LocaleParentCulture>
6266
<LocaleSpecificCulture>de-DE</LocaleSpecificCulture>
6367
<IsLangPack>true</IsLangPack>
6468
</SetupLanguages>
65-
<SetupLanguagesInclude="FRA"Condition="'$(LocLanguages)' != ''">
69+
<SetupLanguagesInclude="FRA">
6670
<LocaleCode>FRA</LocaleCode>
6771
<LocaleId>1036</LocaleId>
72+
<LocaleParentId>12</LocaleParentId>
6873
<LocaleParentCulture>fr</LocaleParentCulture>
6974
<LocaleSpecificCulture>fr-FR</LocaleSpecificCulture>
7075
<IsLangPack>true</IsLangPack>
7176
</SetupLanguages>
72-
<SetupLanguagesInclude="ITA"Condition="'$(LocLanguages)' != ''">
77+
<SetupLanguagesInclude="ITA">
7378
<LocaleCode>ITA</LocaleCode>
7479
<LocaleId>1040</LocaleId>
80+
<LocaleParentId>16</LocaleParentId>
7581
<LocaleParentCulture>it</LocaleParentCulture>
7682
<LocaleSpecificCulture>it-IT</LocaleSpecificCulture>
7783
<IsLangPack>true</IsLangPack>
7884
</SetupLanguages>
79-
<SetupLanguagesInclude="JPN"Condition="'$(LocLanguages)' != ''">
85+
<SetupLanguagesInclude="JPN">
8086
<LocaleCode>JPN</LocaleCode>
8187
<LocaleId>1041</LocaleId>
88+
<LocaleParentId>17</LocaleParentId>
8289
<LocaleParentCulture>ja</LocaleParentCulture>
8390
<LocaleSpecificCulture>ja-JP</LocaleSpecificCulture>
8491
<IsLangPack>true</IsLangPack>
8592
</SetupLanguages>
86-
<SetupLanguagesInclude="KOR"Condition="'$(LocLanguages)' != ''">
93+
<SetupLanguagesInclude="KOR">
8794
<LocaleCode>KOR</LocaleCode>
8895
<LocaleId>1042</LocaleId>
96+
<LocaleParentId>18</LocaleParentId>
8997
<LocaleParentCulture>ko</LocaleParentCulture>
9098
<LocaleSpecificCulture>ko-KR</LocaleSpecificCulture>
9199
<IsLangPack>true</IsLangPack>
92100
</SetupLanguages>
93-
<SetupLanguagesInclude="PLK"Condition="'$(LocLanguages)' != ''">
101+
<SetupLanguagesInclude="PLK">
94102
<LocaleCode>PLK</LocaleCode>
95103
<LocaleId>1045</LocaleId>
104+
<LocaleParentId>21</LocaleParentId>
96105
<LocaleParentCulture>pl</LocaleParentCulture>
97106
<LocaleSpecificCulture>pl-PL</LocaleSpecificCulture>
98107
<IsLangPack>true</IsLangPack>
99108
</SetupLanguages>
100-
<SetupLanguagesInclude="PTB"Condition="'$(LocLanguages)' != ''">
109+
<SetupLanguagesInclude="PTB">
101110
<LocaleCode>PTB</LocaleCode>
102111
<LocaleId>1046</LocaleId>
112+
<LocaleParentId>1046</LocaleParentId>
103113
<LocaleParentCulture>pt-BR</LocaleParentCulture>
104114
<LocaleSpecificCulture>pt-BR</LocaleSpecificCulture>
105115
<IsLangPack>true</IsLangPack>
106116
</SetupLanguages>
107-
<SetupLanguagesInclude="RUS"Condition="'$(LocLanguages)' != ''">
117+
<SetupLanguagesInclude="RUS">
108118
<LocaleCode>RUS</LocaleCode>
109119
<LocaleId>1049</LocaleId>
120+
<LocaleParentId>25</LocaleParentId>
110121
<LocaleParentCulture>ru</LocaleParentCulture>
111122
<LocaleSpecificCulture>ru-RU</LocaleSpecificCulture>
112123
<IsLangPack>true</IsLangPack>
113124
</SetupLanguages>
114-
<SetupLanguagesInclude="TRK"Condition="'$(LocLanguages)' != ''">
125+
<SetupLanguagesInclude="TRK">
115126
<LocaleCode>TRK</LocaleCode>
116127
<LocaleId>1055</LocaleId>
128+
<LocaleParentId>31</LocaleParentId>
117129
<LocaleParentCulture>tr</LocaleParentCulture>
118130
<LocaleSpecificCulture>tr-TR</LocaleSpecificCulture>
119131
<IsLangPack>true</IsLangPack>
120132
</SetupLanguages>
121-
<SetupLanguagesInclude="CHS"Condition="'$(LocLanguages)' != ''">
133+
<SetupLanguagesInclude="CHS">
122134
<LocaleCode>CHS</LocaleCode>
123135
<LocaleId>2052</LocaleId>
136+
<LocaleParentId>4</LocaleParentId>
124137
<LocaleParentCulture>zh-Hans</LocaleParentCulture>
125138
<LocaleSpecificCulture>zh-CN</LocaleSpecificCulture>
126139
<IsLangPack>true</IsLangPack>
127140
</SetupLanguages>
128-
<SetupLanguagesInclude="ESN"Condition="'$(LocLanguages)' != ''">
141+
<SetupLanguagesInclude="ESN">
129142
<LocaleCode>ESN</LocaleCode>
130143
<LocaleId>3082</LocaleId>
144+
<LocaleParentId>10</LocaleParentId>
131145
<LocaleParentCulture>es</LocaleParentCulture>
132146
<LocaleSpecificCulture>es-ES</LocaleSpecificCulture>
133147
<IsLangPack>true</IsLangPack>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2222
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
2323
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
24-
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
24+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
25+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentId=$(LocaleParentId)</PackagePreprocessorDefinitions>
2526
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
2627
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)</PackagePreprocessorDefinitions>
2728
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentC
1616
file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.ProjectSystem.FSharp.resources.dll" vs.file.ngen=yes
1717
file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.ProjectSystem.PropertyPages.resources.dll" vs.file.ngen=yes
1818
file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.VS.FSI.resources.dll" vs.file.ngen=yes
19-
file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\fsi.resources.dll" vs.file.ngen=yes
20-
file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\fsiAnyCpu.resources.dll" vs.file.ngen=yes

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
2222
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
2323
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
24+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentId=$(LocaleParentId)</PackagePreprocessorDefinitions>
2425
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
2526
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)</PackagePreprocessorDefinitions>
2627
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
@@ -42,6 +43,7 @@
4243
<TargetName="CheckPropertiesArePassed">
4344
<ErrorCondition="'$(LocaleCode)' == ''"Text="A 'LocaleCode' property must be passed to the project." />
4445
<ErrorCondition="'$(LocaleId)' == ''"Text="A 'LocaleId' property must be passed to the project." />
46+
<ErrorCondition="'$(LocaleParentId)' == ''"Text="A 'LocaleParentId' property must be passed to the project." />
4547
<ErrorCondition="'$(LocaleParentCulture)' == ''"Text="A 'LocaleParentCulture' property must be passed to the project." />
4648
<ErrorCondition="'$(LocaleSpecificCulture)' == ''"Text="A 'LocaleSpecificCulture' property must be passed to the project." />
4749
<ErrorCondition="'$(IsLangPack)' == ''"Text="A 'IsLangPack' property must be passed to the project." />

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,10 @@ package name=Microsoft.FSharp.VSIX.Full.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.language=$(LocaleSpecificCulture)
66

7-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject"
8-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config"
9-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\AssemblyInfo.fs"
10-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\ConsoleApplication.fsproj"
11-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\ConsoleApplication.vstemplate"
12-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\Program.fs"
13-
14-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject"
15-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\AssemblyInfo.fs"
16-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.fsproj"
17-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.vstemplate"
18-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library1.fs"
19-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\Script.fsx"
20-
21-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject"
22-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.fsproj"
23-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\TutorialProject\Tutorial.fsx"
24-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.vstemplate"
7+
folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)"
8+
folder "ConsoleApplication"
9+
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\FSharp\$(LocaleParentId)\ConsoleApplication.zip"
10+
folder "Library"
11+
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\FSharp\$(LocaleParentId)\Library.zip"
12+
folder "Tutorial"
13+
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\FSharp\$(LocaleParentId)\Tutorial.zip"

‎setup/fsharp-setup-build.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@
6060
<!-- Wix targets files doesn't handle localization parameters correctly. Cleaning before building files accross languages-->
6161
<MSBuildProjects="%(WixSetupProjects.ProjectPath)"
6262
Targets="Clean;Build"
63-
Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
63+
Properties="LocaleCode=%(WixSetupProjects.LocaleCode);LocaleId=%(WixSetupProjects.LocaleId);LocaleParentId=%(WixSetupProjects.LocaleParentId);LocaleParentCulture=%(WixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(WixSetupProjects.LocaleSpecificCulture);IsLangPack=%(WixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
6464
<MSBuildProjects="%(VsixProjects.ProjectPath)"
6565
Targets="Build"
6666
Properties="IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(InsertionDir)"/>
6767
<MSBuildProjects="%(SwixSetupProjects.ProjectPath)"
6868
Targets="Build"
69-
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
69+
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion)"/>
7070

7171
<!-- copy json stuff-->
7272
<CopySourceFiles="@(InsertionItems)"DestinationFolder="$(InsertionDir)" />

‎setup/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<packageid="System.Collections.Immutable"version="1.3.1" />
4-
<packageid="System.Reflection.Metadata"version="1.4.1-beta-24227-04" />
4+
<packageid="System.Reflection.Metadata"version="1.4.2" />
55
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.1.0" />
6-
<packageid="Microsoft.DiaSymReader"version="1.0.8" />
6+
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
77
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />
88
<packageid="MicroBuild.Core"version="0.2.0" />
99
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp