huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-enable setup localization (#11094)

This commit is contained in:
Jacques Eloff 2019-06-11 09:21:06 -07:00 committed by Nate McMaster
parent c7a9da58b4
commit 147f5afb1e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
View File

@ -8,6 +8,7 @@
SuppressOptionsUI="yes" SuppressOptionsUI="yes"
ThemeFile="thm.xml" ThemeFile="thm.xml"
LocalizationFile="thm.wxl"/> LocalizationFile="thm.wxl"/>
<PayloadGroupRef Id="PG_Resources"/>
</BootstrapperApplicationRef> </BootstrapperApplicationRef>
<!-- Ensure upgrades from 3.0.0 preview 1, 2, and 3. Conditioned for the 3.0.0 family. --> <!-- Ensure upgrades from 3.0.0 preview 1, 2, and 3. Conditioned for the 3.0.0 family. -->
@ -23,6 +24,12 @@
<?endif?> <?endif?>
<?endif?> <?endif?>
<PayloadGroup Id="PG_Resources">
<?foreach lcid in 2052;1028;1029;1031;3082;1036;1040;1041;1042;1045;1046;1049;1055?>
<Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>
<?endforeach?>
</PayloadGroup>
<!-- Customizations of the default BA --> <!-- Customizations of the default BA -->
<Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" /> <Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" />
<OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" /> <OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" />

8
src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
View File

@ -9,6 +9,7 @@
SuppressOptionsUI="yes" SuppressOptionsUI="yes"
ThemeFile="thm.xml" ThemeFile="thm.xml"
LocalizationFile="thm.wxl"/> LocalizationFile="thm.wxl"/>
<PayloadGroupRef Id="PG_Resources"/>
</BootstrapperApplicationRef> </BootstrapperApplicationRef>
<!-- Ensure upgrades from 3.0.0 preview 1 and 2 (Preview 3 was not shipped). Conditioned for the 3.0.0 family. Hosting bundle simships x86/x64 so there's <!-- Ensure upgrades from 3.0.0 preview 1 and 2 (Preview 3 was not shipped). Conditioned for the 3.0.0 family. Hosting bundle simships x86/x64 so there's
@ -18,6 +19,13 @@
<RelatedBundle Action="Upgrade" Id="{EA47395A-BC9B-3ECC-8229-229BC9528DF6}"/> <RelatedBundle Action="Upgrade" Id="{EA47395A-BC9B-3ECC-8229-229BC9528DF6}"/>
<?endif?> <?endif?>
<PayloadGroup Id="PG_Resources">
<?foreach lcid in 2052;1028;1029;1031;3082;1036;1040;1041;1042;1045;1046;1049;1055?>
<Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>
<Payload Id="PL_Strings_$(var.lcid)" SourceFile="$(var.lcid)\Strings.wxl" Name="$(var.lcid)\Strings.wxl" Compressed="yes"/>
<?endforeach?>
</PayloadGroup>
<!-- Customizations of the default BA --> <!-- Customizations of the default BA -->
<Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" /> <Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" />
<OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" /> <OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" />