Skip to content

Commit 041a673

Browse files
authored
Remove cruft from Win bundle installers (#45909)
- part of #44582 - see the "Confusing unused strings and pages in WiX sources" section - remove Strings.wxl files in Windows Hosting bundle - remove Options page and related strings (options are disabled) - also remove a few other unreferenced strings
1 parent ced4a46 commit 041a673

File tree

22 files changed

+0
-205
lines changed

22 files changed

+0
-205
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<String Id="Caption"><!--_locComment_text="{Locked='[BundleNameFull]'}"-->[BundleNameFull] Setup</String>
44
<String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
55
<String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
6-
<String Id="InstallHeader">Welcome</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>
86
<String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
97
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
108
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
@@ -18,16 +16,9 @@
1816
/norestart - suppress any attempts to restart. By default UI will prompt before restart.
1917
/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
2018
<String Id="HelpCloseButton">&amp;Close</String>
21-
<String Id="InstallLicenseLinkText"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
2219
<String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
23-
<String Id="InstallOptionsButton">&amp;Options</String>
2420
<String Id="InstallInstallButton">&amp;Install</String>
2521
<String Id="InstallCloseButton">&amp;Close</String>
26-
<String Id="OptionsHeader">Setup Options</String>
27-
<String Id="OptionsLocationLabel">Install location:</String>
28-
<String Id="OptionsBrowseButton">&amp;Browse</String>
29-
<String Id="OptionsOkButton">&amp;OK</String>
30-
<String Id="OptionsCancelButton">&amp;Cancel</String>
3122
<String Id="ProgressHeader">Setup Progress</String>
3223
<String Id="ProgressLabel">Processing:</String>
3324
<String Id="OverallProgressPackageText">Initializing...</String>

src/Installers/Windows/SharedFrameworkBundle/thm.wxl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<String Id="Caption"><!--_locComment_text="{Locked='[BundleNameFull]'}"-->[BundleNameFull] Setup</String>
44
<String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
55
<String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
6-
<String Id="InstallHeader">Welcome</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>
86
<String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
97
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
108
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
@@ -18,16 +16,9 @@
1816
/norestart - suppress any attempts to restart. By default UI will prompt before restart.
1917
/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
2018
<String Id="HelpCloseButton">&amp;Close</String>
21-
<String Id="InstallLicenseLinkText"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
2219
<String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
23-
<String Id="InstallOptionsButton">&amp;Options</String>
2420
<String Id="InstallInstallButton">&amp;Install</String>
2521
<String Id="InstallCloseButton">&amp;Close</String>
26-
<String Id="OptionsHeader">Setup Options</String>
27-
<String Id="OptionsLocationLabel">Install location:</String>
28-
<String Id="OptionsBrowseButton">&amp;Browse</String>
29-
<String Id="OptionsOkButton">&amp;OK</String>
30-
<String Id="OptionsCancelButton">&amp;Cancel</String>
3122
<String Id="ProgressHeader">Setup Progress</String>
3223
<String Id="ProgressLabel">Processing:</String>
3324
<String Id="OverallProgressPackageText">Initializing...</String>

src/Installers/Windows/SharedFrameworkBundle/thm.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,9 @@
2020
<Text X="11" Y="90" Width="-11" Height="30" FontId="3">#(loc.Welcome)</Text>
2121
<Hypertext Name="EulaAndPrivacyHyperlink" X="11" Y="131" Width="-11" Height="51" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
2222
<Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="34" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
23-
<Button Name="OptionsButton" X="-191" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
2423
<Button Name="InstallButton" X="-91" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
2524
<Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
2625
</Page>
27-
<Page Name="Options">
28-
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
29-
<Text X="11" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
30-
<Editbox Name="FolderEditbox" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
31-
<Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
32-
<Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
33-
<Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
34-
</Page>
3526
<Page Name="FilesInUse">
3627
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
3728
<Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>

src/Installers/Windows/WindowsHostingBundle/1028/Strings.wxl

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Installers/Windows/WindowsHostingBundle/1029/Strings.wxl

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Installers/Windows/WindowsHostingBundle/1031/Strings.wxl

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Installers/Windows/WindowsHostingBundle/1033/Strings.wxl

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<String Id="Caption"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] Setup</String>
44
<String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
55
<String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
6-
<String Id="InstallHeader">Welcome</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>
86
<String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
97
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
108
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
@@ -18,16 +16,9 @@
1816
/norestart - suppress any attempts to restart. By default UI will prompt before restart.
1917
/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
2018
<String Id="HelpCloseButton">&amp;Close</String>
21-
<String Id="InstallLicenseLinkText"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
2219
<String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
23-
<String Id="InstallOptionsButton">&amp;Options</String>
2420
<String Id="InstallInstallButton">&amp;Install</String>
2521
<String Id="InstallCloseButton">&amp;Close</String>
26-
<String Id="OptionsHeader">Setup Options</String>
27-
<String Id="OptionsLocationLabel">Install location:</String>
28-
<String Id="OptionsBrowseButton">&amp;Browse</String>
29-
<String Id="OptionsOkButton">&amp;OK</String>
30-
<String Id="OptionsCancelButton">&amp;Cancel</String>
3122
<String Id="ProgressHeader">Setup Progress</String>
3223
<String Id="ProgressLabel">Processing:</String>
3324
<String Id="OverallProgressPackageText">Initializing...</String>

src/Installers/Windows/WindowsHostingBundle/1036/Strings.wxl

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Installers/Windows/WindowsHostingBundle/1040/Strings.wxl

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)