mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable localization of some wxs strings

Browse source
This commit is contained in:
Marc Paine 2021-11-05 11:48:16 -07:00
parent 65bbfd0728
commit ec997a96d0
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
View file

@ -79,4 +79,7 @@ Resources
<String Id="VisualStudioWarning">If you plan to use .NET 6.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. &lt;A HREF=&quot;https://aka.ms/dotnet6-release-notes&quot;&gt;Learn more&lt;/A&gt;. <String Id="VisualStudioWarning">If you plan to use .NET 6.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. &lt;A HREF=&quot;https://aka.ms/dotnet6-release-notes&quot;&gt;Learn more&lt;/A&gt;.
</String> </String>
<String Id="LicenseAssent">By clicking Install, you agree to the following terms:</String> <String Id="LicenseAssent">By clicking Install, you agree to the following terms:</String>
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot;</String>
</WixLocalization> </WixLocalization>

6
src/redist/targets/packaging/windows/clisdk/bundle.wxs
View file

@ -10,16 +10,16 @@
AboutUrl="https://aka.ms/netcorehelp/" AboutUrl="https://aka.ms/netcorehelp/"
Compressed="yes"> Compressed="yes">
<bal:Condition Message="The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;"> <bal:Condition Message="!(loc.InstallPathx64x86)">
WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
</bal:Condition> </bal:Condition>
<bal:Condition Message="The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;"> <bal:Condition Message="!(loc.InstallPathARM64x86)">
WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
</bal:Condition> </bal:Condition>
<!-- Permit same path on non-ARM64 machines since past SDKs always wrote this value --> <!-- Permit same path on non-ARM64 machines since past SDKs always wrote this value -->
<bal:Condition Message="The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot;"> <bal:Condition Message="!(loc.InstallPathARM64x64)">
WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) OR DOTNETHOMESIMILARITYCHECKOVERRIDE WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
</bal:Condition> </bal:Condition>