Skip to content

Commit b82ff44

Browse files
dougbudougbu
authored
Add loc comments and fix Windows installer bug (dotnet#44170)
* Add loc comments and fix Windows installer bug - dotnet#44167, escape square brackets in `[directory]` - add loc comments to lock WiX substitutions * Support manual runs of the localization pipeline - manual builds will create loc project but not use the loc backend * Fix typos in Windows Hosting Bundle loc comments
1 parent baab058 commit b82ff44

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

‎.azure/pipelines/localization.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ variables:
2020
value: AspNetCore
2121

2222
jobs:
23-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
23+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
2424
- template: /eng/common/templates/job/onelocbuild.yml
2525
parameters:
26+
CreatePr: ${{ ne(variables['Build.Reason'], 'Manual') }}
2627
LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
2728
LclSource: lclFilesFromPackage
2829
MirrorRepo: aspnetcore

‎src/Installers/Windows/SharedFrameworkBundle/thm.wxl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
3-
<String Id="Caption">[BundleNameFull] Setup</String>
4-
<String Id="Title">[BundleNameShort]</String>
5-
<String Id="SubTitle">[BundleNameSub]</String>
3+
<String Id="Caption"><!--_locComment_text="{Locked='[BundleNameFull]'}"-->[BundleNameFull] Setup</String>
4+
<String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
5+
<String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
66
<String Id="InstallHeader">Welcome</String>
7-
<String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.</String>
8-
<String Id="InstallVersion">Version [WixBundleVersion]</String>
7+
<String Id="InstallMessage"><!--_locComment_text="{Locked='[WixBundleName]'}"-->Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.</String>
8+
<String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
99
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
1010
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
1111
<String Id="HelpHeader">Setup Help</String>
12-
<String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or
12+
<String Id="HelpText">/install | /repair | /uninstall | /layout [\[]directory[\[] - installs, repairs, uninstalls or
1313
creates a complete local copy of the bundle in directory. Install is the default.
1414

1515
/passive | /quiet - displays minimal UI with no prompts or displays no UI and
@@ -18,7 +18,7 @@
1818
/norestart - suppress any attempts to restart. By default UI will prompt before restart.
1919
/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
2020
<String Id="HelpCloseButton">&amp;Close</String>
21-
<String Id="InstallLicenseLinkText">[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
21+
<String Id="InstallLicenseLinkText"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
2222
<String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
2323
<String Id="InstallOptionsButton">&amp;Options</String>
2424
<String Id="InstallInstallButton">&amp;Install</String>
@@ -38,16 +38,16 @@
3838
<String Id="ModifyCloseButton">&amp;Close</String>
3939
<String Id="SuccessRepairHeader">Repair Successfully Completed</String>
4040
<String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
41-
<String Id="SuccessInstallHeader">Installation Successfully Completed</String>
42-
<String Id="SuccessHeader">Setup Successful</String>
41+
<String Id="SuccessInstallHeader">Installation Successfully Completed</String>
42+
<String Id="SuccessHeader">Setup Successful</String>
4343
<String Id="SuccessLaunchButton">&amp;Launch</String>
4444
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
4545
<String Id="SuccessRestartButton">&amp;Restart</String>
4646
<String Id="SuccessCloseButton">&amp;Close</String>
4747
<String Id="FailureHeader">Setup Failed</String>
4848
<String Id="FailureInstallHeader">Setup Failed</String>
4949
<String Id="FailureUninstallHeader">Uninstall Failed</String>
50-
<String Id="FailureRepairHeader">Repair Failed</String>
50+
<String Id="FailureRepairHeader">Repair Failed</String>
5151
<String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
5252
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
5353
<String Id="FailureRestartButton">&amp;Restart</String>
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Cancel</String>
6161

62-
<String Id="Welcome">Welcome to the [WixBundleName] Setup.</String>
63-
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
62+
<String Id="Welcome"><!--_locComment_text="{Locked='[WixBundleName]'}"-->Welcome to the [WixBundleName] Setup.</String>
63+
<String Id="EulaPrivacy"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
6464
</WixLocalization>

‎src/Installers/Windows/WindowsHostingBundle/thm.wxl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
3-
<String Id="Caption">[WixBundleName] Setup</String>
4-
<String Id="Title">[BundleNameShort]</String>
5-
<String Id="SubTitle">[BundleNameSub]</String>
3+
<String Id="Caption"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] Setup</String>
4+
<String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
5+
<String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
66
<String Id="InstallHeader">Welcome</String>
7-
<String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.</String>
8-
<String Id="InstallVersion">Version [WixBundleVersion]</String>
7+
<String Id="InstallMessage"><!--_locComment_text="{Locked='[WixBundleName]'}"-->Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.</String>
8+
<String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
99
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
1010
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
1111
<String Id="HelpHeader">Setup Help</String>
12-
<String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or
12+
<String Id="HelpText">/install | /repair | /uninstall | /layout [\[]directory[\]] - installs, repairs, uninstalls or
1313
creates a complete local copy of the bundle in directory. Install is the default.
1414

1515
/passive | /quiet - displays minimal UI with no prompts or displays no UI and
@@ -18,7 +18,7 @@
1818
/norestart - suppress any attempts to restart. By default UI will prompt before restart.
1919
/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
2020
<String Id="HelpCloseButton">&amp;Close</String>
21-
<String Id="InstallLicenseLinkText">[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
21+
<String Id="InstallLicenseLinkText"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
2222
<String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
2323
<String Id="InstallOptionsButton">&amp;Options</String>
2424
<String Id="InstallInstallButton">&amp;Install</String>
@@ -38,16 +38,16 @@
3838
<String Id="ModifyCloseButton">&amp;Close</String>
3939
<String Id="SuccessRepairHeader">Repair Successfully Completed</String>
4040
<String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
41-
<String Id="SuccessInstallHeader">Installation Successfully Completed</String>
42-
<String Id="SuccessHeader">Setup Successful</String>
41+
<String Id="SuccessInstallHeader">Installation Successfully Completed</String>
42+
<String Id="SuccessHeader">Setup Successful</String>
4343
<String Id="SuccessLaunchButton">&amp;Launch</String>
4444
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
4545
<String Id="SuccessRestartButton">&amp;Restart</String>
4646
<String Id="SuccessCloseButton">&amp;Close</String>
4747
<String Id="FailureHeader">Setup Failed</String>
4848
<String Id="FailureInstallHeader">Setup Failed</String>
4949
<String Id="FailureUninstallHeader">Uninstall Failed</String>
50-
<String Id="FailureRepairHeader">Repair Failed</String>
50+
<String Id="FailureRepairHeader">Repair Failed</String>
5151
<String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
5252
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
5353
<String Id="FailureRestartButton">&amp;Restart</String>
@@ -60,10 +60,10 @@
6060
<String Id="FilesInUseCancelButton">&amp;Cancel</String>
6161

6262
<!-- Custom UI strings -->
63-
<String Id="Welcome">Welcome to the [WixBundleName] Setup.</String>
63+
<String Id="Welcome"><!--_locComment_text="{Locked='[WixBundleName]'}"-->Welcome to the [WixBundleName] Setup.</String>
6464
<String Id="InstallResetIIS">Please restart IIS after the installation completes. You can find additional information &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;here&lt;/a&gt;.</String>
6565
<String Id="InstallNoIIS">IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;here&lt;/a&gt;.</String>
66-
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
66+
<String Id="EulaPrivacy"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
6767
<String Id="ModifyResetIIS">Please restart IIS after the installation completes. You can find additional information &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;here&lt;/a&gt;.</String>
6868
<String Id="ModifyNoIIS">IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href="https://go.microsoft.com/fwlink/?LinkId=798277"&gt;here&lt;/a&gt;.</String>
6969
</WixLocalization>

0 commit comments

Comments
 (0)