aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-07-14 13:44:25 -0700
committerRob Mensching <rob@firegiant.com>2020-07-19 10:09:05 -0700
commitcfb65eedf737462489e03fd80a4805a4d7ec1316 (patch)
treea4022ac9a9d15721caa08f60b4895e3bea956bd6 /src
parenta6b77f7e7f1a36a1fe8fdee6ba1e78c994e100e7 (diff)
downloadwix-cfb65eedf737462489e03fd80a4805a4d7ec1316.tar.gz
wix-cfb65eedf737462489e03fd80a4805a4d7ec1316.tar.bz2
wix-cfb65eedf737462489e03fd80a4805a4d7ec1316.zip
Run latest conversions on .wxs code
Diffstat (limited to 'src')
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs45
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs45
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs45
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs45
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs45
-rw-r--r--src/wixlib/AdvancedWelcomeEulaDlg.wxs60
-rw-r--r--src/wixlib/BrowseDlg.wxs15
-rw-r--r--src/wixlib/CancelDlg.wxs7
-rw-r--r--src/wixlib/Common.wxs103
-rw-r--r--src/wixlib/Common_Platform.wxi21
-rw-r--r--src/wixlib/Common_x86.wxs3
-rw-r--r--src/wixlib/CustomizeDlg.wxs21
-rw-r--r--src/wixlib/DiskCostDlg.wxs5
-rw-r--r--src/wixlib/ErrorDlg.wxs17
-rw-r--r--src/wixlib/ErrorProgressText.wxs465
-rw-r--r--src/wixlib/ExitDialog.wxs11
-rw-r--r--src/wixlib/FatalError.wxs5
-rw-r--r--src/wixlib/FeaturesDlg.wxs65
-rw-r--r--src/wixlib/FilesInUse.wxs9
-rw-r--r--src/wixlib/InstallDirDlg.wxs5
-rw-r--r--src/wixlib/InstallScopeDlg.wxs20
-rw-r--r--src/wixlib/InvalidDirDlg.wxs5
-rw-r--r--src/wixlib/LicenseAgreementDlg.wxs13
-rw-r--r--src/wixlib/MaintenanceTypeDlg.wxs44
-rw-r--r--src/wixlib/MaintenanceWelcomeDlg.wxs9
-rw-r--r--src/wixlib/MsiRMFilesInUse.wxs9
-rw-r--r--src/wixlib/OutOfDiskDlg.wxs5
-rw-r--r--src/wixlib/OutOfRbDiskDlg.wxs9
-rw-r--r--src/wixlib/PrepareDlg.wxs5
-rw-r--r--src/wixlib/ProgressDlg.wxs45
-rw-r--r--src/wixlib/ResumeDlg.wxs37
-rw-r--r--src/wixlib/SetupTypeDlg.wxs15
-rw-r--r--src/wixlib/UserExit.wxs5
-rw-r--r--src/wixlib/VerifyReadyDlg.wxs204
-rw-r--r--src/wixlib/WaitForCostingDlg.wxs5
-rw-r--r--src/wixlib/WelcomeDlg.wxs21
-rw-r--r--src/wixlib/WelcomeEulaDlg.wxs43
-rw-r--r--src/wixlib/WixUI_Advanced.wxs94
-rw-r--r--src/wixlib/WixUI_FeatureTree.wxs35
-rw-r--r--src/wixlib/WixUI_InstallDir.wxs59
-rw-r--r--src/wixlib/WixUI_Minimal.wxs23
-rw-r--r--src/wixlib/WixUI_Mondo.wxs47
-rw-r--r--src/wixlib/caSuffix.wxi13
43 files changed, 812 insertions, 990 deletions
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
index bbc54ac6..2c3ca0a0 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
@@ -1,29 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 <MediaTemplate /> 6 <MediaTemplate />
8 7
9 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 12 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
14 <Component> 13 <Component>
15 <File Source="example.txt" /> 14 <File Source="example.txt" />
16 </Component> 15 </Component>
17 </ComponentGroup> 16 </ComponentGroup>
18 17
19 <UIRef Id="WixUI_Advanced" /> 18 <UIRef Id="WixUI_Advanced" />
20 </Product> 19 </Product>
21 20
22 <Fragment> 21 <Fragment>
23 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <Directory Id="TARGETDIR" Name="SourceDir">
24 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="ProgramFilesFolder">
25 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
26 </Directory> 25 </Directory>
27 </Directory> 26 </Directory>
28 </Fragment> 27 </Fragment>
29</Wix> 28</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
index 9f630f99..dc0e990d 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
@@ -1,29 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 <MediaTemplate /> 6 <MediaTemplate />
8 7
9 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 12 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
14 <Component> 13 <Component>
15 <File Source="example.txt" /> 14 <File Source="example.txt" />
16 </Component> 15 </Component>
17 </ComponentGroup> 16 </ComponentGroup>
18 17
19 <UIRef Id="WixUI_FeatureTree" /> 18 <UIRef Id="WixUI_FeatureTree" />
20 </Product> 19 </Product>
21 20
22 <Fragment> 21 <Fragment>
23 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <Directory Id="TARGETDIR" Name="SourceDir">
24 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="ProgramFilesFolder">
25 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
26 </Directory> 25 </Directory>
27 </Directory> 26 </Directory>
28 </Fragment> 27 </Fragment>
29</Wix> 28</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
index 6239c7ab..8ed3866e 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
@@ -1,29 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 <MediaTemplate /> 6 <MediaTemplate />
8 7
9 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 12 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
14 <Component> 13 <Component>
15 <File Source="example.txt" /> 14 <File Source="example.txt" />
16 </Component> 15 </Component>
17 </ComponentGroup> 16 </ComponentGroup>
18 17
19 <UIRef Id="WixUI_InstallDir" /> 18 <UIRef Id="WixUI_InstallDir" />
20 </Product> 19 </Product>
21 20
22 <Fragment> 21 <Fragment>
23 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <Directory Id="TARGETDIR" Name="SourceDir">
24 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="ProgramFilesFolder">
25 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
26 </Directory> 25 </Directory>
27 </Directory> 26 </Directory>
28 </Fragment> 27 </Fragment>
29</Wix> 28</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
index 9f84785f..a1e9ed60 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
@@ -1,29 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 <MediaTemplate /> 6 <MediaTemplate />
8 7
9 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 12 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
14 <Component> 13 <Component>
15 <File Source="example.txt" /> 14 <File Source="example.txt" />
16 </Component> 15 </Component>
17 </ComponentGroup> 16 </ComponentGroup>
18 17
19 <UIRef Id="WixUI_Minimal" /> 18 <UIRef Id="WixUI_Minimal" />
20 </Product> 19 </Product>
21 20
22 <Fragment> 21 <Fragment>
23 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <Directory Id="TARGETDIR" Name="SourceDir">
24 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="ProgramFilesFolder">
25 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
26 </Directory> 25 </Directory>
27 </Directory> 26 </Directory>
28 </Fragment> 27 </Fragment>
29</Wix> 28</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
index a670cae9..03e4173d 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
@@ -1,29 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 <MediaTemplate /> 6 <MediaTemplate />
8 7
9 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 12 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
14 <Component> 13 <Component>
15 <File Source="example.txt" /> 14 <File Source="example.txt" />
16 </Component> 15 </Component>
17 </ComponentGroup> 16 </ComponentGroup>
18 17
19 <UIRef Id="WixUI_Mondo" /> 18 <UIRef Id="WixUI_Mondo" />
20 </Product> 19 </Product>
21 20
22 <Fragment> 21 <Fragment>
23 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <Directory Id="TARGETDIR" Name="SourceDir">
24 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="ProgramFilesFolder">
25 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
26 </Directory> 25 </Directory>
27 </Directory> 26 </Directory>
28 </Fragment> 27 </Fragment>
29</Wix> 28</Wix>
diff --git a/src/wixlib/AdvancedWelcomeEulaDlg.wxs b/src/wixlib/AdvancedWelcomeEulaDlg.wxs
index 46f371c9..96b22f1e 100644
--- a/src/wixlib/AdvancedWelcomeEulaDlg.wxs
+++ b/src/wixlib/AdvancedWelcomeEulaDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -9,44 +8,31 @@
9 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdvancedWelcomeEulaDlgBannerBitmap)" /> 8 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdvancedWelcomeEulaDlgBannerBitmap)" />
10 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 9 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
11 <Control Id="Title" Type="Text" X="20" Y="10" Width="300" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.AdvancedWelcomeEulaDlgTitle)" /> 10 <Control Id="Title" Type="Text" X="20" Y="10" Width="300" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.AdvancedWelcomeEulaDlgTitle)" />
12 <Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)"> 11 <Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)" ShowCondition="ALLUSERS" />
13 <Condition Action="show">ALLUSERS</Condition> 12 <Control Id="DescriptionPerUser" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerUser)" ShowCondition="NOT ALLUSERS" />
14 </Control>
15 <Control Id="DescriptionPerUser" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerUser)">
16 <Condition Action="show">NOT ALLUSERS</Condition>
17 </Control>
18 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="180" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" /> 13 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="180" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
19 <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)"> 14 <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
20 <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish> 15 <Publish Event="DoAction" Value="WixUIPrintEula" />
21 </Control> 16 </Control>
22 <Control Id="Advanced" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.AdvancedWelcomeEulaDlgAdvanced)"> 17 <Control Id="Advanced" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.AdvancedWelcomeEulaDlgAdvanced)" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" />
23 <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition> 18 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" ShowCondition="ALLUSERS">
24 <Condition Action="enable">LicenseAccepted = "1"</Condition> 19 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
25 </Control> 20 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
26 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes"> 21 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
27 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 22 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
28 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 23 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
29 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 24 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
30 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 25 </Control>
31 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 26 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" ShowCondition="NOT ALLUSERS">
32 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 27 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
33 <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition> 28 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
34 <Condition Action="enable">LicenseAccepted = "1"</Condition> 29 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
35 <Condition Action="show">ALLUSERS</Condition> 30 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
36 </Control> 31 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
37 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes"> 32 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
38 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
39 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
40 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
41 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
42 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
43 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
44 <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
45 <Condition Action="enable">LicenseAccepted = "1"</Condition>
46 <Condition Action="show">NOT ALLUSERS</Condition>
47 </Control> 33 </Control>
48 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 34 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
49 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 35 <Publish Event="SpawnDialog" Value="CancelDlg" />
50 </Control> 36 </Control>
51 <Control Id="LicenseText" Type="ScrollableText" X="20" Y="55" Width="330" Height="121" Sunken="yes" TabSkip="no"> 37 <Control Id="LicenseText" Type="ScrollableText" X="20" Y="55" Width="330" Height="121" Sunken="yes" TabSkip="no">
52 <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" /> 38 <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" />
@@ -55,7 +41,7 @@
55 </UI> 41 </UI>
56 42
57 <InstallUISequence> 43 <InstallUISequence>
58 <Show Dialog="AdvancedWelcomeEulaDlg" Before="ProgressDlg">NOT Installed</Show> 44 <Show Dialog="AdvancedWelcomeEulaDlg" Before="ProgressDlg" Condition="NOT Installed" />
59 </InstallUISequence> 45 </InstallUISequence>
60 </Fragment> 46 </Fragment>
61</Wix> 47</Wix>
diff --git a/src/wixlib/BrowseDlg.wxs b/src/wixlib/BrowseDlg.wxs
index 9eaa3f42..dbb104fe 100644
--- a/src/wixlib/BrowseDlg.wxs
+++ b/src/wixlib/BrowseDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -8,22 +7,22 @@
8 <Dialog Id="BrowseDlg" Width="370" Height="270" Title="!(loc.BrowseDlg_Title)"> 7 <Dialog Id="BrowseDlg" Width="370" Height="270" Title="!(loc.BrowseDlg_Title)">
9 <Control Id="PathEdit" Type="PathEdit" X="25" Y="202" Width="320" Height="18" Property="_BrowseProperty" Indirect="yes" /> 8 <Control Id="PathEdit" Type="PathEdit" X="25" Y="202" Width="320" Height="18" Property="_BrowseProperty" Indirect="yes" />
10 <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)"> 9 <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
11 <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish> 10 <Publish Event="SetTargetPath" Value="[_BrowseProperty]" />
12 <Publish Event="EndDialog" Value="Return">1</Publish> 11 <Publish Event="EndDialog" Value="Return" />
13 </Control> 12 </Control>
14 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 13 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
15 <Publish Event="Reset" Value="0">1</Publish> 14 <Publish Event="Reset" Value="0" />
16 <Publish Event="EndDialog" Value="Return">1</Publish> 15 <Publish Event="EndDialog" Value="Return" />
17 </Control> 16 </Control>
18 <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlgComboLabel)" /> 17 <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlgComboLabel)" />
19 <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes"> 18 <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
20 <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" /> 19 <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
21 </Control> 20 </Control>
22 <Control Id="WixUI_Bmp_Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgWixUI_Bmp_UpTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgWixUI_Bmp_Up)"> 21 <Control Id="WixUI_Bmp_Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgWixUI_Bmp_UpTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgWixUI_Bmp_Up)">
23 <Publish Event="DirectoryListUp" Value="0">1</Publish> 22 <Publish Event="DirectoryListUp" Value="0" />
24 </Control> 23 </Control>
25 <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)"> 24 <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)">
26 <Publish Event="DirectoryListNew" Value="0">1</Publish> 25 <Publish Event="DirectoryListNew" Value="0" />
27 </Control> 26 </Control>
28 <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" /> 27 <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
29 <Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" /> 28 <Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
diff --git a/src/wixlib/CancelDlg.wxs b/src/wixlib/CancelDlg.wxs
index 3c15627b..0a72a415 100644
--- a/src/wixlib/CancelDlg.wxs
+++ b/src/wixlib/CancelDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,10 +6,10 @@
7 <UI> 6 <UI>
8 <Dialog Id="CancelDlg" Width="260" Height="85" Title="!(loc.CancelDlg_Title)"> 7 <Dialog Id="CancelDlg" Width="260" Height="85" Title="!(loc.CancelDlg_Title)">
9 <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUINo)"> 8 <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUINo)">
10 <Publish Event="EndDialog" Value="Return">1</Publish> 9 <Publish Event="EndDialog" Value="Return" />
11 </Control> 10 </Control>
12 <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.WixUIYes)"> 11 <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.WixUIYes)">
13 <Publish Event="EndDialog" Value="Exit">1</Publish> 12 <Publish Event="EndDialog" Value="Exit" />
14 </Control> 13 </Control>
15 <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" NoPrefix="yes" Text="!(loc.CancelDlgText)" /> 14 <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" NoPrefix="yes" Text="!(loc.CancelDlgText)" />
16 <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.CancelDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.CancelDlgIcon)" /> 15 <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.CancelDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.CancelDlgIcon)" />
diff --git a/src/wixlib/Common.wxs b/src/wixlib/Common.wxs
index 8f870499..476b00da 100644
--- a/src/wixlib/Common.wxs
+++ b/src/wixlib/Common.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -15,56 +14,56 @@
15 <UI Id="WixUI_Common"> 14 <UI Id="WixUI_Common">
16 <!-- ui text --> 15 <!-- ui text -->
17 <UIText Id="AbsentPath" /> 16 <UIText Id="AbsentPath" />
18 <UIText Id="bytes">!(loc.UITextbytes)</UIText> 17 <UIText Id="bytes" Value="!(loc.UITextbytes)" />
19 <UIText Id="GB">!(loc.UITextGB)</UIText> 18 <UIText Id="GB" Value="!(loc.UITextGB)" />
20 <UIText Id="KB">!(loc.UITextKB)</UIText> 19 <UIText Id="KB" Value="!(loc.UITextKB)" />
21 <UIText Id="MB">!(loc.UITextMB)</UIText> 20 <UIText Id="MB" Value="!(loc.UITextMB)" />
22 <UIText Id="MenuAbsent">!(loc.UITextMenuAbsent)</UIText> 21 <UIText Id="MenuAbsent" Value="!(loc.UITextMenuAbsent)" />
23 <UIText Id="MenuAdvertise">!(loc.UITextMenuAdvertise)</UIText> 22 <UIText Id="MenuAdvertise" Value="!(loc.UITextMenuAdvertise)" />
24 <UIText Id="MenuAllCD">!(loc.UITextMenuAllCD)</UIText> 23 <UIText Id="MenuAllCD" Value="!(loc.UITextMenuAllCD)" />
25 <UIText Id="MenuAllLocal">!(loc.UITextMenuAllLocal)</UIText> 24 <UIText Id="MenuAllLocal" Value="!(loc.UITextMenuAllLocal)" />
26 <UIText Id="MenuAllNetwork">!(loc.UITextMenuAllNetwork)</UIText> 25 <UIText Id="MenuAllNetwork" Value="!(loc.UITextMenuAllNetwork)" />
27 <UIText Id="MenuCD">!(loc.UITextMenuCD)</UIText> 26 <UIText Id="MenuCD" Value="!(loc.UITextMenuCD)" />
28 <UIText Id="MenuLocal">!(loc.UITextMenuLocal)</UIText> 27 <UIText Id="MenuLocal" Value="!(loc.UITextMenuLocal)" />
29 <UIText Id="MenuNetwork">!(loc.UITextMenuNetwork)</UIText> 28 <UIText Id="MenuNetwork" Value="!(loc.UITextMenuNetwork)" />
30 <UIText Id="NewFolder">!(loc.UITextNewFolder)</UIText> 29 <UIText Id="NewFolder" Value="!(loc.UITextNewFolder)" />
31 <UIText Id="ScriptInProgress">!(loc.UITextScriptInProgress)</UIText> 30 <UIText Id="ScriptInProgress" Value="!(loc.UITextScriptInProgress)" />
32 <UIText Id="SelAbsentAbsent">!(loc.UITextSelAbsentAbsent)</UIText> 31 <UIText Id="SelAbsentAbsent" Value="!(loc.UITextSelAbsentAbsent)" />
33 <UIText Id="SelAbsentAdvertise">!(loc.UITextSelAbsentAdvertise)</UIText> 32 <UIText Id="SelAbsentAdvertise" Value="!(loc.UITextSelAbsentAdvertise)" />
34 <UIText Id="SelAbsentCD">!(loc.UITextSelAbsentCD)</UIText> 33 <UIText Id="SelAbsentCD" Value="!(loc.UITextSelAbsentCD)" />
35 <UIText Id="SelAbsentLocal">!(loc.UITextSelAbsentLocal)</UIText> 34 <UIText Id="SelAbsentLocal" Value="!(loc.UITextSelAbsentLocal)" />
36 <UIText Id="SelAbsentNetwork">!(loc.UITextSelAbsentNetwork)</UIText> 35 <UIText Id="SelAbsentNetwork" Value="!(loc.UITextSelAbsentNetwork)" />
37 <UIText Id="SelAdvertiseAbsent">!(loc.UITextSelAdvertiseAbsent)</UIText> 36 <UIText Id="SelAdvertiseAbsent" Value="!(loc.UITextSelAdvertiseAbsent)" />
38 <UIText Id="SelAdvertiseAdvertise">!(loc.UITextSelAdvertiseAdvertise)</UIText> 37 <UIText Id="SelAdvertiseAdvertise" Value="!(loc.UITextSelAdvertiseAdvertise)" />
39 <UIText Id="SelAdvertiseCD">!(loc.UITextSelAdvertiseCD)</UIText> 38 <UIText Id="SelAdvertiseCD" Value="!(loc.UITextSelAdvertiseCD)" />
40 <UIText Id="SelAdvertiseLocal">!(loc.UITextSelAdvertiseLocal)</UIText> 39 <UIText Id="SelAdvertiseLocal" Value="!(loc.UITextSelAdvertiseLocal)" />
41 <UIText Id="SelAdvertiseNetwork">!(loc.UITextSelAdvertiseNetwork)</UIText> 40 <UIText Id="SelAdvertiseNetwork" Value="!(loc.UITextSelAdvertiseNetwork)" />
42 <UIText Id="SelCDAbsent">!(loc.UITextSelCDAbsent)</UIText> 41 <UIText Id="SelCDAbsent" Value="!(loc.UITextSelCDAbsent)" />
43 <UIText Id="SelCDAdvertise">!(loc.UITextSelCDAdvertise)</UIText> 42 <UIText Id="SelCDAdvertise" Value="!(loc.UITextSelCDAdvertise)" />
44 <UIText Id="SelCDCD">!(loc.UITextSelCDCD)</UIText> 43 <UIText Id="SelCDCD" Value="!(loc.UITextSelCDCD)" />
45 <UIText Id="SelCDLocal">!(loc.UITextSelCDLocal)</UIText> 44 <UIText Id="SelCDLocal" Value="!(loc.UITextSelCDLocal)" />
46 <UIText Id="SelChildCostNeg">!(loc.UITextSelChildCostNeg)</UIText> 45 <UIText Id="SelChildCostNeg" Value="!(loc.UITextSelChildCostNeg)" />
47 <UIText Id="SelChildCostPos">!(loc.UITextSelChildCostPos)</UIText> 46 <UIText Id="SelChildCostPos" Value="!(loc.UITextSelChildCostPos)" />
48 <UIText Id="SelCostPending">!(loc.UITextSelCostPending)</UIText> 47 <UIText Id="SelCostPending" Value="!(loc.UITextSelCostPending)" />
49 <UIText Id="SelLocalAbsent">!(loc.UITextSelLocalAbsent)</UIText> 48 <UIText Id="SelLocalAbsent" Value="!(loc.UITextSelLocalAbsent)" />
50 <UIText Id="SelLocalAdvertise">!(loc.UITextSelLocalAdvertise)</UIText> 49 <UIText Id="SelLocalAdvertise" Value="!(loc.UITextSelLocalAdvertise)" />
51 <UIText Id="SelLocalCD">!(loc.UITextSelLocalCD)</UIText> 50 <UIText Id="SelLocalCD" Value="!(loc.UITextSelLocalCD)" />
52 <UIText Id="SelLocalLocal">!(loc.UITextSelLocalLocal)</UIText> 51 <UIText Id="SelLocalLocal" Value="!(loc.UITextSelLocalLocal)" />
53 <UIText Id="SelLocalNetwork">!(loc.UITextSelLocalNetwork)</UIText> 52 <UIText Id="SelLocalNetwork" Value="!(loc.UITextSelLocalNetwork)" />
54 <UIText Id="SelNetworkAbsent">!(loc.UITextSelNetworkAbsent)</UIText> 53 <UIText Id="SelNetworkAbsent" Value="!(loc.UITextSelNetworkAbsent)" />
55 <UIText Id="SelNetworkAdvertise">!(loc.UITextSelNetworkAdvertise)</UIText> 54 <UIText Id="SelNetworkAdvertise" Value="!(loc.UITextSelNetworkAdvertise)" />
56 <UIText Id="SelNetworkLocal">!(loc.UITextSelNetworkLocal)</UIText> 55 <UIText Id="SelNetworkLocal" Value="!(loc.UITextSelNetworkLocal)" />
57 <UIText Id="SelNetworkNetwork">!(loc.UITextSelNetworkNetwork)</UIText> 56 <UIText Id="SelNetworkNetwork" Value="!(loc.UITextSelNetworkNetwork)" />
58 <UIText Id="SelParentCostNegNeg">!(loc.UITextSelParentCostNegNeg)</UIText> 57 <UIText Id="SelParentCostNegNeg" Value="!(loc.UITextSelParentCostNegNeg)" />
59 <UIText Id="SelParentCostNegPos">!(loc.UITextSelParentCostNegPos)</UIText> 58 <UIText Id="SelParentCostNegPos" Value="!(loc.UITextSelParentCostNegPos)" />
60 <UIText Id="SelParentCostPosNeg">!(loc.UITextSelParentCostPosNeg)</UIText> 59 <UIText Id="SelParentCostPosNeg" Value="!(loc.UITextSelParentCostPosNeg)" />
61 <UIText Id="SelParentCostPosPos">!(loc.UITextSelParentCostPosPos)</UIText> 60 <UIText Id="SelParentCostPosPos" Value="!(loc.UITextSelParentCostPosPos)" />
62 <UIText Id="TimeRemaining">!(loc.UITextTimeRemaining)</UIText> 61 <UIText Id="TimeRemaining" Value="!(loc.UITextTimeRemaining)" />
63 <UIText Id="VolumeCostAvailable">!(loc.UITextVolumeCostAvailable)</UIText> 62 <UIText Id="VolumeCostAvailable" Value="!(loc.UITextVolumeCostAvailable)" />
64 <UIText Id="VolumeCostDifference">!(loc.UITextVolumeCostDifference)</UIText> 63 <UIText Id="VolumeCostDifference" Value="!(loc.UITextVolumeCostDifference)" />
65 <UIText Id="VolumeCostRequired">!(loc.UITextVolumeCostRequired)</UIText> 64 <UIText Id="VolumeCostRequired" Value="!(loc.UITextVolumeCostRequired)" />
66 <UIText Id="VolumeCostSize">!(loc.UITextVolumeCostSize)</UIText> 65 <UIText Id="VolumeCostSize" Value="!(loc.UITextVolumeCostSize)" />
67 <UIText Id="VolumeCostVolume">!(loc.UITextVolumeCostVolume)</UIText> 66 <UIText Id="VolumeCostVolume" Value="!(loc.UITextVolumeCostVolume)" />
68 </UI> 67 </UI>
69 </Fragment> 68 </Fragment>
70</Wix> 69</Wix>
diff --git a/src/wixlib/Common_Platform.wxi b/src/wixlib/Common_Platform.wxi
index 1dc0de19..20cf8b86 100644
--- a/src/wixlib/Common_Platform.wxi
+++ b/src/wixlib/Common_Platform.wxi
@@ -1,20 +1,19 @@
1<?xml version="1.0"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?include caSuffix.wxi ?> 5 <?include caSuffix.wxi ?>
7 <Fragment> 6 <Fragment>
8 <!-- print EULA functionality --> 7 <!-- print EULA functionality -->
9 <CustomAction Id="WixUIPrintEula$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" /> 8 <CustomAction Id="WixUIPrintEula$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" />
10 </Fragment> 9 </Fragment>
11 10
12 <Fragment> 11 <Fragment>
13 <!-- Validate install directory --> 12 <!-- Validate install directory -->
14 <CustomAction Id="WixUIValidatePath$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" /> 13 <CustomAction Id="WixUIValidatePath$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" />
15 </Fragment> 14 </Fragment>
16 15
17 <Fragment> 16 <Fragment>
18 <Binary Id="WixUIWixca$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))uica.dll" /> 17 <Binary Id="WixUIWixca$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))uica.dll" />
19 </Fragment> 18 </Fragment>
20</Include> 19</Include>
diff --git a/src/wixlib/Common_x86.wxs b/src/wixlib/Common_x86.wxs
index fb9155cd..d5aa42c3 100644
--- a/src/wixlib/Common_x86.wxs
+++ b/src/wixlib/Common_x86.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/CustomizeDlg.wxs b/src/wixlib/CustomizeDlg.wxs
index 79fcef39..12541d5b 100644
--- a/src/wixlib/CustomizeDlg.wxs
+++ b/src/wixlib/CustomizeDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,17 +6,15 @@
7 <UI> 6 <UI>
8 <Dialog Id="CustomizeDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes"> 7 <Dialog Id="CustomizeDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
9 <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" /> 8 <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
10 <Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)"> 9 <Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)" HideCondition="Installed" DisableCondition="Installed">
11 <Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish> 10 <Publish Event="SelectionBrowse" Value="BrowseDlg" />
12 <Condition Action="hide">Installed</Condition>
13 <Condition Action="disable">Installed</Condition>
14 </Control> 11 </Control>
15 <Control Id="Reset" Type="PushButton" X="10" Y="243" Width="81" Height="17" Text="!(loc.CustomizeDlgReset)"> 12 <Control Id="Reset" Type="PushButton" X="10" Y="243" Width="81" Height="17" Text="!(loc.CustomizeDlgReset)">
16 <Publish Event="Reset" Value="0">1</Publish> 13 <Publish Event="Reset" Value="0" />
17 <Subscribe Event="SelectionNoItems" Attribute="Enabled" /> 14 <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
18 </Control> 15 </Control>
19 <Control Id="DiskCost" Type="PushButton" X="91" Y="243" Width="100" Height="17" Text="!(loc.CustomizeDlgDiskCost)"> 16 <Control Id="DiskCost" Type="PushButton" X="91" Y="243" Width="100" Height="17" Text="!(loc.CustomizeDlgDiskCost)">
20 <Publish Event="SpawnDialog" Value="DiskCostDlg">1</Publish> 17 <Publish Event="SpawnDialog" Value="DiskCostDlg" />
21 <Subscribe Event="SelectionNoItems" Attribute="Enabled" /> 18 <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
22 </Control> 19 </Control>
23 <Control Id="Back" Type="PushButton" X="192" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 20 <Control Id="Back" Type="PushButton" X="192" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
@@ -25,7 +22,7 @@
25 <Subscribe Event="SelectionNoItems" Attribute="Enabled" /> 22 <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
26 </Control> 23 </Control>
27 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 24 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
28 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 25 <Publish Event="SpawnDialog" Value="CancelDlg" />
29 </Control> 26 </Control>
30 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" /> 27 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
31 <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" /> 28 <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
@@ -40,14 +37,12 @@
40 <Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)"> 37 <Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)">
41 <Subscribe Event="SelectionSize" Attribute="Text" /> 38 <Subscribe Event="SelectionSize" Attribute="Text" />
42 </Control> 39 </Control>
43 <Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)"> 40 <Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)" HideCondition="Installed">
44 <Subscribe Event="SelectionPath" Attribute="Text" /> 41 <Subscribe Event="SelectionPath" Attribute="Text" />
45 <Subscribe Event="SelectionPathOn" Attribute="Visible" /> 42 <Subscribe Event="SelectionPathOn" Attribute="Visible" />
46 <Condition Action="hide">Installed</Condition>
47 </Control> 43 </Control>
48 <Control Id="LocationLabel" Type="Text" X="25" Y="210" Width="65" Height="10" Text="!(loc.CustomizeDlgLocationLabel)"> 44 <Control Id="LocationLabel" Type="Text" X="25" Y="210" Width="65" Height="10" Text="!(loc.CustomizeDlgLocationLabel)" HideCondition="Installed">
49 <Subscribe Event="SelectionPathOn" Attribute="Visible" /> 45 <Subscribe Event="SelectionPathOn" Attribute="Visible" />
50 <Condition Action="hide">Installed</Condition>
51 </Control> 46 </Control>
52 </Dialog> 47 </Dialog>
53 </UI> 48 </UI>
diff --git a/src/wixlib/DiskCostDlg.wxs b/src/wixlib/DiskCostDlg.wxs
index f0a5e083..e1ac90ec 100644
--- a/src/wixlib/DiskCostDlg.wxs
+++ b/src/wixlib/DiskCostDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="DiskCostDlg" Width="370" Height="270" Title="!(loc.DiskCostDlg_Title)"> 7 <Dialog Id="DiskCostDlg" Width="370" Height="270" Title="!(loc.DiskCostDlg_Title)">
9 <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)"> 8 <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)">
10 <Publish Event="EndDialog" Value="Return">1</Publish> 9 <Publish Event="EndDialog" Value="Return" />
11 </Control> 10 </Control>
12 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.DiskCostDlgBannerBitmap)" /> 11 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.DiskCostDlgBannerBitmap)" />
13 <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="50" Text="!(loc.DiskCostDlgText)" /> 12 <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="50" Text="!(loc.DiskCostDlgText)" />
diff --git a/src/wixlib/ErrorDlg.wxs b/src/wixlib/ErrorDlg.wxs
index 08f41264..ccad45fb 100644
--- a/src/wixlib/ErrorDlg.wxs
+++ b/src/wixlib/ErrorDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -8,26 +7,26 @@
8 <Dialog Id="ErrorDlg" Width="270" Height="105" Title="!(loc.ErrorDlg_Title)" ErrorDialog="yes"> 7 <Dialog Id="ErrorDlg" Width="270" Height="105" Title="!(loc.ErrorDlg_Title)" ErrorDialog="yes">
9 <Control Id="ErrorText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" NoPrefix="yes" Text="!(loc.ErrorDlgErrorText)" /> 8 <Control Id="ErrorText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" NoPrefix="yes" Text="!(loc.ErrorDlgErrorText)" />
10 <Control Id="Y" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIYes)"> 9 <Control Id="Y" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIYes)">
11 <Publish Event="EndDialog" Value="ErrorYes">1</Publish> 10 <Publish Event="EndDialog" Value="ErrorYes" />
12 </Control> 11 </Control>
13 <Control Id="A" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUICancel)"> 12 <Control Id="A" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUICancel)">
14 <Publish Event="EndDialog" Value="ErrorAbort">1</Publish> 13 <Publish Event="EndDialog" Value="ErrorAbort" />
15 </Control> 14 </Control>
16 <Control Id="C" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUICancel)"> 15 <Control Id="C" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUICancel)">
17 <Publish Event="EndDialog" Value="ErrorCancel">1</Publish> 16 <Publish Event="EndDialog" Value="ErrorCancel" />
18 </Control> 17 </Control>
19 <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" /> 18 <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" />
20 <Control Id="I" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIIgnore)"> 19 <Control Id="I" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIIgnore)">
21 <Publish Event="EndDialog" Value="ErrorIgnore">1</Publish> 20 <Publish Event="EndDialog" Value="ErrorIgnore" />
22 </Control> 21 </Control>
23 <Control Id="N" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUINo)"> 22 <Control Id="N" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUINo)">
24 <Publish Event="EndDialog" Value="ErrorNo">1</Publish> 23 <Publish Event="EndDialog" Value="ErrorNo" />
25 </Control> 24 </Control>
26 <Control Id="O" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)"> 25 <Control Id="O" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)">
27 <Publish Event="EndDialog" Value="ErrorOk">1</Publish> 26 <Publish Event="EndDialog" Value="ErrorOk" />
28 </Control> 27 </Control>
29 <Control Id="R" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIRetry)"> 28 <Control Id="R" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIRetry)">
30 <Publish Event="EndDialog" Value="ErrorRetry">1</Publish> 29 <Publish Event="EndDialog" Value="ErrorRetry" />
31 </Control> 30 </Control>
32 </Dialog> 31 </Dialog>
33 32
diff --git a/src/wixlib/ErrorProgressText.wxs b/src/wixlib/ErrorProgressText.wxs
index e1ffbe0b..8cc710f4 100644
--- a/src/wixlib/ErrorProgressText.wxs
+++ b/src/wixlib/ErrorProgressText.wxs
@@ -1,245 +1,244 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment> 5 <Fragment>
7 <UI Id="WixUI_ErrorProgressText"> 6 <UI Id="WixUI_ErrorProgressText">
8 <!-- action text --> 7 <!-- action text -->
9 <ProgressText Action="InstallValidate">!(loc.ProgressTextInstallValidate)</ProgressText> 8 <ProgressText Action="InstallValidate" Message="!(loc.ProgressTextInstallValidate)" />
10 <ProgressText Action="InstallFiles" Template="!(loc.ProgressTextInstallFilesTemplate)">!(loc.ProgressTextInstallFiles)</ProgressText> 9 <ProgressText Action="InstallFiles" Template="!(loc.ProgressTextInstallFilesTemplate)" Message="!(loc.ProgressTextInstallFiles)" />
11 <ProgressText Action="InstallAdminPackage" Template="!(loc.ProgressTextInstallAdminPackageTemplate)">!(loc.ProgressTextInstallAdminPackage)</ProgressText> 10 <ProgressText Action="InstallAdminPackage" Template="!(loc.ProgressTextInstallAdminPackageTemplate)" Message="!(loc.ProgressTextInstallAdminPackage)" />
12 <ProgressText Action="FileCost">!(loc.ProgressTextFileCost)</ProgressText> 11 <ProgressText Action="FileCost" Message="!(loc.ProgressTextFileCost)" />
13 <ProgressText Action="CostInitialize">!(loc.ProgressTextCostInitialize)</ProgressText> 12 <ProgressText Action="CostInitialize" Message="!(loc.ProgressTextCostInitialize)" />
14 <ProgressText Action="CostFinalize">!(loc.ProgressTextCostFinalize)</ProgressText> 13 <ProgressText Action="CostFinalize" Message="!(loc.ProgressTextCostFinalize)" />
15 <ProgressText Action="CreateShortcuts" Template="!(loc.ProgressTextCreateShortcutsTemplate)">!(loc.ProgressTextCreateShortcuts)</ProgressText> 14 <ProgressText Action="CreateShortcuts" Template="!(loc.ProgressTextCreateShortcutsTemplate)" Message="!(loc.ProgressTextCreateShortcuts)" />
16 <ProgressText Action="PublishComponents" Template="!(loc.ProgressTextPublishComponentsTemplate)">!(loc.ProgressTextPublishComponents)</ProgressText> 15 <ProgressText Action="PublishComponents" Template="!(loc.ProgressTextPublishComponentsTemplate)" Message="!(loc.ProgressTextPublishComponents)" />
17 <ProgressText Action="PublishFeatures" Template="!(loc.ProgressTextPublishFeaturesTemplate)">!(loc.ProgressTextPublishFeatures)</ProgressText> 16 <ProgressText Action="PublishFeatures" Template="!(loc.ProgressTextPublishFeaturesTemplate)" Message="!(loc.ProgressTextPublishFeatures)" />
18 <ProgressText Action="PublishProduct">!(loc.ProgressTextPublishProduct)</ProgressText> 17 <ProgressText Action="PublishProduct" Message="!(loc.ProgressTextPublishProduct)" />
19 <ProgressText Action="RegisterClassInfo" Template="!(loc.ProgressTextRegisterClassInfoTemplate)">!(loc.ProgressTextRegisterClassInfo)</ProgressText> 18 <ProgressText Action="RegisterClassInfo" Template="!(loc.ProgressTextRegisterClassInfoTemplate)" Message="!(loc.ProgressTextRegisterClassInfo)" />
20 <ProgressText Action="RegisterExtensionInfo" Template="!(loc.ProgressTextRegisterExtensionInfoTemplate)">!(loc.ProgressTextRegisterExtensionInfo)</ProgressText> 19 <ProgressText Action="RegisterExtensionInfo" Template="!(loc.ProgressTextRegisterExtensionInfoTemplate)" Message="!(loc.ProgressTextRegisterExtensionInfo)" />
21 <ProgressText Action="RegisterMIMEInfo" Template="!(loc.ProgressTextRegisterMIMEInfoTemplate)">!(loc.ProgressTextRegisterMIMEInfo)</ProgressText> 20 <ProgressText Action="RegisterMIMEInfo" Template="!(loc.ProgressTextRegisterMIMEInfoTemplate)" Message="!(loc.ProgressTextRegisterMIMEInfo)" />
22 <ProgressText Action="RegisterProgIdInfo" Template="!(loc.ProgressTextRegisterProgIdInfoTemplate)">!(loc.ProgressTextRegisterProgIdInfo)</ProgressText> 21 <ProgressText Action="RegisterProgIdInfo" Template="!(loc.ProgressTextRegisterProgIdInfoTemplate)" Message="!(loc.ProgressTextRegisterProgIdInfo)" />
23 <ProgressText Action="AllocateRegistrySpace" Template="!(loc.ProgressTextAllocateRegistrySpaceTemplate)">!(loc.ProgressTextAllocateRegistrySpace)</ProgressText> 22 <ProgressText Action="AllocateRegistrySpace" Template="!(loc.ProgressTextAllocateRegistrySpaceTemplate)" Message="!(loc.ProgressTextAllocateRegistrySpace)" />
24 <ProgressText Action="AppSearch" Template="!(loc.ProgressTextAppSearchTemplate)">!(loc.ProgressTextAppSearch)</ProgressText> 23 <ProgressText Action="AppSearch" Template="!(loc.ProgressTextAppSearchTemplate)" Message="!(loc.ProgressTextAppSearch)" />
25 <ProgressText Action="BindImage" Template="!(loc.ProgressTextBindImageTemplate)">!(loc.ProgressTextBindImage)</ProgressText> 24 <ProgressText Action="BindImage" Template="!(loc.ProgressTextBindImageTemplate)" Message="!(loc.ProgressTextBindImage)" />
26 <ProgressText Action="CCPSearch">!(loc.ProgressTextCCPSearch)</ProgressText> 25 <ProgressText Action="CCPSearch" Message="!(loc.ProgressTextCCPSearch)" />
27 <ProgressText Action="CreateFolders" Template="!(loc.ProgressTextCreateFoldersTemplate)">!(loc.ProgressTextCreateFolders)</ProgressText> 26 <ProgressText Action="CreateFolders" Template="!(loc.ProgressTextCreateFoldersTemplate)" Message="!(loc.ProgressTextCreateFolders)" />
28 <ProgressText Action="DeleteServices" Template="!(loc.ProgressTextDeleteServicesTemplate)">!(loc.ProgressTextDeleteServices)</ProgressText> 27 <ProgressText Action="DeleteServices" Template="!(loc.ProgressTextDeleteServicesTemplate)" Message="!(loc.ProgressTextDeleteServices)" />
29 <ProgressText Action="DuplicateFiles" Template="!(loc.ProgressTextDuplicateFilesTemplate)">!(loc.ProgressTextDuplicateFiles)</ProgressText> 28 <ProgressText Action="DuplicateFiles" Template="!(loc.ProgressTextDuplicateFilesTemplate)" Message="!(loc.ProgressTextDuplicateFiles)" />
30 <ProgressText Action="FindRelatedProducts" Template="!(loc.ProgressTextFindRelatedProductsTemplate)">!(loc.ProgressTextFindRelatedProducts)</ProgressText> 29 <ProgressText Action="FindRelatedProducts" Template="!(loc.ProgressTextFindRelatedProductsTemplate)" Message="!(loc.ProgressTextFindRelatedProducts)" />
31 <ProgressText Action="InstallODBC">!(loc.ProgressTextInstallODBC)</ProgressText> 30 <ProgressText Action="InstallODBC" Message="!(loc.ProgressTextInstallODBC)" />
32 <ProgressText Action="InstallServices" Template="!(loc.ProgressTextInstallServicesTemplate)">!(loc.ProgressTextInstallServices)</ProgressText> 31 <ProgressText Action="InstallServices" Template="!(loc.ProgressTextInstallServicesTemplate)" Message="!(loc.ProgressTextInstallServices)" />
33 <ProgressText Action="LaunchConditions">!(loc.ProgressTextLaunchConditions)</ProgressText> 32 <ProgressText Action="LaunchConditions" Message="!(loc.ProgressTextLaunchConditions)" />
34 <ProgressText Action="MigrateFeatureStates" Template="!(loc.ProgressTextMigrateFeatureStatesTemplate)">!(loc.ProgressTextMigrateFeatureStates)</ProgressText> 33 <ProgressText Action="MigrateFeatureStates" Template="!(loc.ProgressTextMigrateFeatureStatesTemplate)" Message="!(loc.ProgressTextMigrateFeatureStates)" />
35 <ProgressText Action="MoveFiles" Template="!(loc.ProgressTextMoveFilesTemplate)">!(loc.ProgressTextMoveFiles)</ProgressText> 34 <ProgressText Action="MoveFiles" Template="!(loc.ProgressTextMoveFilesTemplate)" Message="!(loc.ProgressTextMoveFiles)" />
36 <ProgressText Action="PatchFiles" Template="!(loc.ProgressTextPatchFilesTemplate)">!(loc.ProgressTextPatchFiles)</ProgressText> 35 <ProgressText Action="PatchFiles" Template="!(loc.ProgressTextPatchFilesTemplate)" Message="!(loc.ProgressTextPatchFiles)" />
37 <ProgressText Action="ProcessComponents">!(loc.ProgressTextProcessComponents)</ProgressText> 36 <ProgressText Action="ProcessComponents" Message="!(loc.ProgressTextProcessComponents)" />
38 <ProgressText Action="RegisterComPlus" Template="!(loc.ProgressTextRegisterComPlusTemplate)">!(loc.ProgressTextRegisterComPlus)</ProgressText> 37 <ProgressText Action="RegisterComPlus" Template="!(loc.ProgressTextRegisterComPlusTemplate)" Message="!(loc.ProgressTextRegisterComPlus)" />
39 <ProgressText Action="RegisterFonts" Template="!(loc.ProgressTextRegisterFontsTemplate)">!(loc.ProgressTextRegisterFonts)</ProgressText> 38 <ProgressText Action="RegisterFonts" Template="!(loc.ProgressTextRegisterFontsTemplate)" Message="!(loc.ProgressTextRegisterFonts)" />
40 <ProgressText Action="RegisterProduct" Template="!(loc.ProgressTextRegisterProductTemplate)">!(loc.ProgressTextRegisterProduct)</ProgressText> 39 <ProgressText Action="RegisterProduct" Template="!(loc.ProgressTextRegisterProductTemplate)" Message="!(loc.ProgressTextRegisterProduct)" />
41 <ProgressText Action="RegisterTypeLibraries" Template="!(loc.ProgressTextRegisterTypeLibrariesTemplate)">!(loc.ProgressTextRegisterTypeLibraries)</ProgressText> 40 <ProgressText Action="RegisterTypeLibraries" Template="!(loc.ProgressTextRegisterTypeLibrariesTemplate)" Message="!(loc.ProgressTextRegisterTypeLibraries)" />
42 <ProgressText Action="RegisterUser" Template="!(loc.ProgressTextRegisterUserTemplate)">!(loc.ProgressTextRegisterUser)</ProgressText> 41 <ProgressText Action="RegisterUser" Template="!(loc.ProgressTextRegisterUserTemplate)" Message="!(loc.ProgressTextRegisterUser)" />
43 <ProgressText Action="RemoveDuplicateFiles" Template="!(loc.ProgressTextRemoveDuplicateFilesTemplate)">!(loc.ProgressTextRemoveDuplicateFiles)</ProgressText> 42 <ProgressText Action="RemoveDuplicateFiles" Template="!(loc.ProgressTextRemoveDuplicateFilesTemplate)" Message="!(loc.ProgressTextRemoveDuplicateFiles)" />
44 <ProgressText Action="RemoveEnvironmentStrings" Template="!(loc.ProgressTextRemoveEnvironmentStringsTemplate)">!(loc.ProgressTextRemoveEnvironmentStrings)</ProgressText> 43 <ProgressText Action="RemoveEnvironmentStrings" Template="!(loc.ProgressTextRemoveEnvironmentStringsTemplate)" Message="!(loc.ProgressTextRemoveEnvironmentStrings)" />
45 <ProgressText Action="RemoveExistingProducts" Template="!(loc.ProgressTextRemoveExistingProductsTemplate)">!(loc.ProgressTextRemoveExistingProducts)</ProgressText> 44 <ProgressText Action="RemoveExistingProducts" Template="!(loc.ProgressTextRemoveExistingProductsTemplate)" Message="!(loc.ProgressTextRemoveExistingProducts)" />
46 <ProgressText Action="RemoveFiles" Template="!(loc.ProgressTextRemoveFilesTemplate)">!(loc.ProgressTextRemoveFiles)</ProgressText> 45 <ProgressText Action="RemoveFiles" Template="!(loc.ProgressTextRemoveFilesTemplate)" Message="!(loc.ProgressTextRemoveFiles)" />
47 <ProgressText Action="RemoveFolders" Template="!(loc.ProgressTextRemoveFoldersTemplate)">!(loc.ProgressTextRemoveFolders)</ProgressText> 46 <ProgressText Action="RemoveFolders" Template="!(loc.ProgressTextRemoveFoldersTemplate)" Message="!(loc.ProgressTextRemoveFolders)" />
48 <ProgressText Action="RemoveIniValues" Template="!(loc.ProgressTextRemoveIniValuesTemplate)">!(loc.ProgressTextRemoveIniValues)</ProgressText> 47 <ProgressText Action="RemoveIniValues" Template="!(loc.ProgressTextRemoveIniValuesTemplate)" Message="!(loc.ProgressTextRemoveIniValues)" />
49 <ProgressText Action="RemoveODBC">!(loc.ProgressTextRemoveODBC)</ProgressText> 48 <ProgressText Action="RemoveODBC" Message="!(loc.ProgressTextRemoveODBC)" />
50 <ProgressText Action="RemoveRegistryValues" Template="!(loc.ProgressTextRemoveRegistryValuesTemplate)">!(loc.ProgressTextRemoveRegistryValues)</ProgressText> 49 <ProgressText Action="RemoveRegistryValues" Template="!(loc.ProgressTextRemoveRegistryValuesTemplate)" Message="!(loc.ProgressTextRemoveRegistryValues)" />
51 <ProgressText Action="RemoveShortcuts" Template="!(loc.ProgressTextRemoveShortcutsTemplate)">!(loc.ProgressTextRemoveShortcuts)</ProgressText> 50 <ProgressText Action="RemoveShortcuts" Template="!(loc.ProgressTextRemoveShortcutsTemplate)" Message="!(loc.ProgressTextRemoveShortcuts)" />
52 <ProgressText Action="RMCCPSearch">!(loc.ProgressTextRMCCPSearch)</ProgressText> 51 <ProgressText Action="RMCCPSearch" Message="!(loc.ProgressTextRMCCPSearch)" />
53 <ProgressText Action="SelfRegModules" Template="!(loc.ProgressTextSelfRegModulesTemplate)">!(loc.ProgressTextSelfRegModules)</ProgressText> 52 <ProgressText Action="SelfRegModules" Template="!(loc.ProgressTextSelfRegModulesTemplate)" Message="!(loc.ProgressTextSelfRegModules)" />
54 <ProgressText Action="SelfUnregModules" Template="!(loc.ProgressTextSelfUnregModulesTemplate)">!(loc.ProgressTextSelfUnregModules)</ProgressText> 53 <ProgressText Action="SelfUnregModules" Template="!(loc.ProgressTextSelfUnregModulesTemplate)" Message="!(loc.ProgressTextSelfUnregModules)" />
55 <ProgressText Action="SetODBCFolders">!(loc.ProgressTextSetODBCFolders)</ProgressText> 54 <ProgressText Action="SetODBCFolders" Message="!(loc.ProgressTextSetODBCFolders)" />
56 <ProgressText Action="StartServices" Template="!(loc.ProgressTextStartServicesTemplate)">!(loc.ProgressTextStartServices)</ProgressText> 55 <ProgressText Action="StartServices" Template="!(loc.ProgressTextStartServicesTemplate)" Message="!(loc.ProgressTextStartServices)" />
57 <ProgressText Action="StopServices" Template="!(loc.ProgressTextStopServicesTemplate)">!(loc.ProgressTextStopServices)</ProgressText> 56 <ProgressText Action="StopServices" Template="!(loc.ProgressTextStopServicesTemplate)" Message="!(loc.ProgressTextStopServices)" />
58 <ProgressText Action="UnpublishComponents" Template="!(loc.ProgressTextUnpublishComponentsTemplate)">!(loc.ProgressTextUnpublishComponents)</ProgressText> 57 <ProgressText Action="UnpublishComponents" Template="!(loc.ProgressTextUnpublishComponentsTemplate)" Message="!(loc.ProgressTextUnpublishComponents)" />
59 <ProgressText Action="UnpublishFeatures" Template="!(loc.ProgressTextUnpublishFeaturesTemplate)">!(loc.ProgressTextUnpublishFeatures)</ProgressText> 58 <ProgressText Action="UnpublishFeatures" Template="!(loc.ProgressTextUnpublishFeaturesTemplate)" Message="!(loc.ProgressTextUnpublishFeatures)" />
60 <ProgressText Action="UnregisterClassInfo" Template="!(loc.ProgressTextUnregisterClassInfoTemplate)">!(loc.ProgressTextUnregisterClassInfo)</ProgressText> 59 <ProgressText Action="UnregisterClassInfo" Template="!(loc.ProgressTextUnregisterClassInfoTemplate)" Message="!(loc.ProgressTextUnregisterClassInfo)" />
61 <ProgressText Action="UnregisterComPlus" Template="!(loc.ProgressTextUnregisterComPlusTemplate)">!(loc.ProgressTextUnregisterComPlus)</ProgressText> 60 <ProgressText Action="UnregisterComPlus" Template="!(loc.ProgressTextUnregisterComPlusTemplate)" Message="!(loc.ProgressTextUnregisterComPlus)" />
62 <ProgressText Action="UnregisterExtensionInfo" Template="!(loc.ProgressTextUnregisterExtensionInfoTemplate)">!(loc.ProgressTextUnregisterExtensionInfo)</ProgressText> 61 <ProgressText Action="UnregisterExtensionInfo" Template="!(loc.ProgressTextUnregisterExtensionInfoTemplate)" Message="!(loc.ProgressTextUnregisterExtensionInfo)" />
63 <ProgressText Action="UnregisterFonts" Template="!(loc.ProgressTextUnregisterFontsTemplate)">!(loc.ProgressTextUnregisterFonts)</ProgressText> 62 <ProgressText Action="UnregisterFonts" Template="!(loc.ProgressTextUnregisterFontsTemplate)" Message="!(loc.ProgressTextUnregisterFonts)" />
64 <ProgressText Action="UnregisterMIMEInfo" Template="!(loc.ProgressTextUnregisterMIMEInfoTemplate)">!(loc.ProgressTextUnregisterMIMEInfo)</ProgressText> 63 <ProgressText Action="UnregisterMIMEInfo" Template="!(loc.ProgressTextUnregisterMIMEInfoTemplate)" Message="!(loc.ProgressTextUnregisterMIMEInfo)" />
65 <ProgressText Action="UnregisterProgIdInfo" Template="!(loc.ProgressTextUnregisterProgIdInfoTemplate)">!(loc.ProgressTextUnregisterProgIdInfo)</ProgressText> 64 <ProgressText Action="UnregisterProgIdInfo" Template="!(loc.ProgressTextUnregisterProgIdInfoTemplate)" Message="!(loc.ProgressTextUnregisterProgIdInfo)" />
66 <ProgressText Action="UnregisterTypeLibraries" Template="!(loc.ProgressTextUnregisterTypeLibrariesTemplate)">!(loc.ProgressTextUnregisterTypeLibraries)</ProgressText> 65 <ProgressText Action="UnregisterTypeLibraries" Template="!(loc.ProgressTextUnregisterTypeLibrariesTemplate)" Message="!(loc.ProgressTextUnregisterTypeLibraries)" />
67 <ProgressText Action="WriteEnvironmentStrings" Template="!(loc.ProgressTextWriteEnvironmentStringsTemplate)">!(loc.ProgressTextWriteEnvironmentStrings)</ProgressText> 66 <ProgressText Action="WriteEnvironmentStrings" Template="!(loc.ProgressTextWriteEnvironmentStringsTemplate)" Message="!(loc.ProgressTextWriteEnvironmentStrings)" />
68 <ProgressText Action="WriteIniValues" Template="!(loc.ProgressTextWriteIniValuesTemplate)">!(loc.ProgressTextWriteIniValues)</ProgressText> 67 <ProgressText Action="WriteIniValues" Template="!(loc.ProgressTextWriteIniValuesTemplate)" Message="!(loc.ProgressTextWriteIniValues)" />
69 <ProgressText Action="WriteRegistryValues" Template="!(loc.ProgressTextWriteRegistryValuesTemplate)">!(loc.ProgressTextWriteRegistryValues)</ProgressText> 68 <ProgressText Action="WriteRegistryValues" Template="!(loc.ProgressTextWriteRegistryValuesTemplate)" Message="!(loc.ProgressTextWriteRegistryValues)" />
70 <ProgressText Action="Advertise">!(loc.ProgressTextAdvertise)</ProgressText> 69 <ProgressText Action="Advertise" Message="!(loc.ProgressTextAdvertise)" />
71 <ProgressText Action="GenerateScript" Template="!(loc.ProgressTextGenerateScriptTemplate)">!(loc.ProgressTextGenerateScript)</ProgressText> 70 <ProgressText Action="GenerateScript" Template="!(loc.ProgressTextGenerateScriptTemplate)" Message="!(loc.ProgressTextGenerateScript)" />
72 <ProgressText Action="InstallSFPCatalogFile" Template="!(loc.ProgressTextInstallSFPCatalogFileTemplate)">!(loc.ProgressTextInstallSFPCatalogFile)</ProgressText> 71 <ProgressText Action="InstallSFPCatalogFile" Template="!(loc.ProgressTextInstallSFPCatalogFileTemplate)" Message="!(loc.ProgressTextInstallSFPCatalogFile)" />
73 <ProgressText Action="MsiPublishAssemblies" Template="!(loc.ProgressTextMsiPublishAssembliesTemplate)">!(loc.ProgressTextMsiPublishAssemblies)</ProgressText> 72 <ProgressText Action="MsiPublishAssemblies" Template="!(loc.ProgressTextMsiPublishAssembliesTemplate)" Message="!(loc.ProgressTextMsiPublishAssemblies)" />
74 <ProgressText Action="MsiUnpublishAssemblies" Template="!(loc.ProgressTextMsiUnpublishAssembliesTemplate)">!(loc.ProgressTextMsiUnpublishAssemblies)</ProgressText> 73 <ProgressText Action="MsiUnpublishAssemblies" Template="!(loc.ProgressTextMsiUnpublishAssembliesTemplate)" Message="!(loc.ProgressTextMsiUnpublishAssemblies)" />
75 <ProgressText Action="Rollback" Template="!(loc.ProgressTextRollbackTemplate)">!(loc.ProgressTextRollback)</ProgressText> 74 <ProgressText Action="Rollback" Template="!(loc.ProgressTextRollbackTemplate)" Message="!(loc.ProgressTextRollback)" />
76 <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanup)</ProgressText> 75 <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)" Message="!(loc.ProgressTextRollbackCleanup)" />
77 <ProgressText Action="UnmoveFiles" Template="!(loc.ProgressTextUnmoveFilesTemplate)">!(loc.ProgressTextUnmoveFiles)</ProgressText> 76 <ProgressText Action="UnmoveFiles" Template="!(loc.ProgressTextUnmoveFilesTemplate)" Message="!(loc.ProgressTextUnmoveFiles)" />
78 <ProgressText Action="UnpublishProduct">!(loc.ProgressTextUnpublishProduct)</ProgressText> 77 <ProgressText Action="UnpublishProduct" Message="!(loc.ProgressTextUnpublishProduct)" />
79 <!-- error text --> 78 <!-- error text -->
80 <Error Id="0">!(loc.Error0)</Error> 79 <Error Id="0" Message="!(loc.Error0)" />
81 <Error Id="1">!(loc.Error1)</Error> 80 <Error Id="1" Message="!(loc.Error1)" />
82 <Error Id="2">!(loc.Error2)</Error> 81 <Error Id="2" Message="!(loc.Error2)" />
83 <Error Id="3" /> 82 <Error Id="3" />
84 <Error Id="4">!(loc.Error4)</Error> 83 <Error Id="4" Message="!(loc.Error4)" />
85 <Error Id="5">!(loc.Error5)</Error> 84 <Error Id="5" Message="!(loc.Error5)" />
86 <Error Id="6" /> 85 <Error Id="6" />
87 <Error Id="7">!(loc.Error7)</Error> 86 <Error Id="7" Message="!(loc.Error7)" />
88 <Error Id="8">!(loc.Error8)</Error> 87 <Error Id="8" Message="!(loc.Error8)" />
89 <Error Id="9">!(loc.Error9)</Error> 88 <Error Id="9" Message="!(loc.Error9)" />
90 <Error Id="10">!(loc.Error10)</Error> 89 <Error Id="10" Message="!(loc.Error10)" />
91 <Error Id="11">!(loc.Error11)</Error> 90 <Error Id="11" Message="!(loc.Error11)" />
92 <Error Id="12">!(loc.Error12)</Error> 91 <Error Id="12" Message="!(loc.Error12)" />
93 <Error Id="13">!(loc.Error13)</Error> 92 <Error Id="13" Message="!(loc.Error13)" />
94 <Error Id="14">!(loc.Error14)</Error> 93 <Error Id="14" Message="!(loc.Error14)" />
95 <Error Id="15">!(loc.Error15)</Error> 94 <Error Id="15" Message="!(loc.Error15)" />
96 <Error Id="16">!(loc.Error16)</Error> 95 <Error Id="16" Message="!(loc.Error16)" />
97 <Error Id="17">!(loc.Error17)</Error> 96 <Error Id="17" Message="!(loc.Error17)" />
98 <Error Id="18">!(loc.Error18)</Error> 97 <Error Id="18" Message="!(loc.Error18)" />
99 <Error Id="19">!(loc.Error19)</Error> 98 <Error Id="19" Message="!(loc.Error19)" />
100 <Error Id="20">!(loc.Error20)</Error> 99 <Error Id="20" Message="!(loc.Error20)" />
101 <Error Id="21">!(loc.Error21)</Error> 100 <Error Id="21" Message="!(loc.Error21)" />
102 <Error Id="22">!(loc.Error22)</Error> 101 <Error Id="22" Message="!(loc.Error22)" />
103 <Error Id="23">!(loc.Error23)</Error> 102 <Error Id="23" Message="!(loc.Error23)" />
104 <Error Id="32">!(loc.Error32)</Error> 103 <Error Id="32" Message="!(loc.Error32)" />
105 <Error Id="33">!(loc.Error33)</Error> 104 <Error Id="33" Message="!(loc.Error33)" />
106 <Error Id="1101">!(loc.Error1101)</Error> 105 <Error Id="1101" Message="!(loc.Error1101)" />
107 <Error Id="1301">!(loc.Error1301)</Error> 106 <Error Id="1301" Message="!(loc.Error1301)" />
108 <Error Id="1302">!(loc.Error1302)</Error> 107 <Error Id="1302" Message="!(loc.Error1302)" />
109 <Error Id="1303">!(loc.Error1303)</Error> 108 <Error Id="1303" Message="!(loc.Error1303)" />
110 <Error Id="1304">!(loc.Error1304)</Error> 109 <Error Id="1304" Message="!(loc.Error1304)" />
111 <Error Id="1305">!(loc.Error1305)</Error> 110 <Error Id="1305" Message="!(loc.Error1305)" />
112 <Error Id="1306">!(loc.Error1306)</Error> 111 <Error Id="1306" Message="!(loc.Error1306)" />
113 <Error Id="1307">!(loc.Error1307)</Error> 112 <Error Id="1307" Message="!(loc.Error1307)" />
114 <Error Id="1308">!(loc.Error1308)</Error> 113 <Error Id="1308" Message="!(loc.Error1308)" />
115 <Error Id="1309">!(loc.Error1309)</Error> 114 <Error Id="1309" Message="!(loc.Error1309)" />
116 <Error Id="1310">!(loc.Error1310)</Error> 115 <Error Id="1310" Message="!(loc.Error1310)" />
117 <Error Id="1311">!(loc.Error1311)</Error> 116 <Error Id="1311" Message="!(loc.Error1311)" />
118 <Error Id="1312">!(loc.Error1312)</Error> 117 <Error Id="1312" Message="!(loc.Error1312)" />
119 <Error Id="1313">!(loc.Error1313)</Error> 118 <Error Id="1313" Message="!(loc.Error1313)" />
120 <Error Id="1314">!(loc.Error1314)</Error> 119 <Error Id="1314" Message="!(loc.Error1314)" />
121 <Error Id="1315">!(loc.Error1315)</Error> 120 <Error Id="1315" Message="!(loc.Error1315)" />
122 <Error Id="1316">!(loc.Error1316)</Error> 121 <Error Id="1316" Message="!(loc.Error1316)" />
123 <Error Id="1317">!(loc.Error1317)</Error> 122 <Error Id="1317" Message="!(loc.Error1317)" />
124 <Error Id="1318">!(loc.Error1318)</Error> 123 <Error Id="1318" Message="!(loc.Error1318)" />
125 <Error Id="1319">!(loc.Error1319)</Error> 124 <Error Id="1319" Message="!(loc.Error1319)" />
126 <Error Id="1320">!(loc.Error1320)</Error> 125 <Error Id="1320" Message="!(loc.Error1320)" />
127 <Error Id="1321">!(loc.Error1321)</Error> 126 <Error Id="1321" Message="!(loc.Error1321)" />
128 <Error Id="1322">!(loc.Error1322)</Error> 127 <Error Id="1322" Message="!(loc.Error1322)" />
129 <Error Id="1323">!(loc.Error1323)</Error> 128 <Error Id="1323" Message="!(loc.Error1323)" />
130 <Error Id="1324">!(loc.Error1324)</Error> 129 <Error Id="1324" Message="!(loc.Error1324)" />
131 <Error Id="1325">!(loc.Error1325)</Error> 130 <Error Id="1325" Message="!(loc.Error1325)" />
132 <Error Id="1326">!(loc.Error1326)</Error> 131 <Error Id="1326" Message="!(loc.Error1326)" />
133 <Error Id="1327">!(loc.Error1327)</Error> 132 <Error Id="1327" Message="!(loc.Error1327)" />
134 <Error Id="1328">!(loc.Error1328)</Error> 133 <Error Id="1328" Message="!(loc.Error1328)" />
135 <Error Id="1329">!(loc.Error1329)</Error> 134 <Error Id="1329" Message="!(loc.Error1329)" />
136 <Error Id="1330">!(loc.Error1330)</Error> 135 <Error Id="1330" Message="!(loc.Error1330)" />
137 <Error Id="1331">!(loc.Error1331)</Error> 136 <Error Id="1331" Message="!(loc.Error1331)" />
138 <Error Id="1332">!(loc.Error1332)</Error> 137 <Error Id="1332" Message="!(loc.Error1332)" />
139 <Error Id="1333">!(loc.Error1333)</Error> 138 <Error Id="1333" Message="!(loc.Error1333)" />
140 <Error Id="1334">!(loc.Error1334)</Error> 139 <Error Id="1334" Message="!(loc.Error1334)" />
141 <Error Id="1335">!(loc.Error1335)</Error> 140 <Error Id="1335" Message="!(loc.Error1335)" />
142 <Error Id="1336">!(loc.Error1336)</Error> 141 <Error Id="1336" Message="!(loc.Error1336)" />
143 <Error Id="1401">!(loc.Error1401)</Error> 142 <Error Id="1401" Message="!(loc.Error1401)" />
144 <Error Id="1402">!(loc.Error1402)</Error> 143 <Error Id="1402" Message="!(loc.Error1402)" />
145 <Error Id="1403">!(loc.Error1403)</Error> 144 <Error Id="1403" Message="!(loc.Error1403)" />
146 <Error Id="1404">!(loc.Error1404)</Error> 145 <Error Id="1404" Message="!(loc.Error1404)" />
147 <Error Id="1405">!(loc.Error1405)</Error> 146 <Error Id="1405" Message="!(loc.Error1405)" />
148 <Error Id="1406">!(loc.Error1406)</Error> 147 <Error Id="1406" Message="!(loc.Error1406)" />
149 <Error Id="1407">!(loc.Error1407)</Error> 148 <Error Id="1407" Message="!(loc.Error1407)" />
150 <Error Id="1408">!(loc.Error1408)</Error> 149 <Error Id="1408" Message="!(loc.Error1408)" />
151 <Error Id="1409">!(loc.Error1409)</Error> 150 <Error Id="1409" Message="!(loc.Error1409)" />
152 <Error Id="1410">!(loc.Error1410)</Error> 151 <Error Id="1410" Message="!(loc.Error1410)" />
153 <Error Id="1500">!(loc.Error1500)</Error> 152 <Error Id="1500" Message="!(loc.Error1500)" />
154 <Error Id="1501">!(loc.Error1501)</Error> 153 <Error Id="1501" Message="!(loc.Error1501)" />
155 <Error Id="1502">!(loc.Error1502)</Error> 154 <Error Id="1502" Message="!(loc.Error1502)" />
156 <Error Id="1503">!(loc.Error1503)</Error> 155 <Error Id="1503" Message="!(loc.Error1503)" />
157 <Error Id="1601">!(loc.Error1601)</Error> 156 <Error Id="1601" Message="!(loc.Error1601)" />
158 <Error Id="1602">!(loc.Error1602)</Error> 157 <Error Id="1602" Message="!(loc.Error1602)" />
159 <Error Id="1603">!(loc.Error1603)</Error> 158 <Error Id="1603" Message="!(loc.Error1603)" />
160 <Error Id="1604">!(loc.Error1604)</Error> 159 <Error Id="1604" Message="!(loc.Error1604)" />
161 <Error Id="1605">!(loc.Error1605)</Error> 160 <Error Id="1605" Message="!(loc.Error1605)" />
162 <Error Id="1606">!(loc.Error1606)</Error> 161 <Error Id="1606" Message="!(loc.Error1606)" />
163 <Error Id="1607">!(loc.Error1607)</Error> 162 <Error Id="1607" Message="!(loc.Error1607)" />
164 <Error Id="1608">!(loc.Error1608)</Error> 163 <Error Id="1608" Message="!(loc.Error1608)" />
165 <Error Id="1609">!(loc.Error1609)</Error> 164 <Error Id="1609" Message="!(loc.Error1609)" />
166 <Error Id="1701">!(loc.Error1701)</Error> 165 <Error Id="1701" Message="!(loc.Error1701)" />
167 <Error Id="1702">!(loc.Error1702)</Error> 166 <Error Id="1702" Message="!(loc.Error1702)" />
168 <Error Id="1703">!(loc.Error1703)</Error> 167 <Error Id="1703" Message="!(loc.Error1703)" />
169 <Error Id="1704">!(loc.Error1704)</Error> 168 <Error Id="1704" Message="!(loc.Error1704)" />
170 <Error Id="1705">!(loc.Error1705)</Error> 169 <Error Id="1705" Message="!(loc.Error1705)" />
171 <Error Id="1706">!(loc.Error1706)</Error> 170 <Error Id="1706" Message="!(loc.Error1706)" />
172 <Error Id="1707">!(loc.Error1707)</Error> 171 <Error Id="1707" Message="!(loc.Error1707)" />
173 <Error Id="1708">!(loc.Error1708)</Error> 172 <Error Id="1708" Message="!(loc.Error1708)" />
174 <Error Id="1709">!(loc.Error1709)</Error> 173 <Error Id="1709" Message="!(loc.Error1709)" />
175 <Error Id="1710">!(loc.Error1710)</Error> 174 <Error Id="1710" Message="!(loc.Error1710)" />
176 <Error Id="1711">!(loc.Error1711)</Error> 175 <Error Id="1711" Message="!(loc.Error1711)" />
177 <Error Id="1712">!(loc.Error1712)</Error> 176 <Error Id="1712" Message="!(loc.Error1712)" />
178 <Error Id="1713">!(loc.Error1713)</Error> 177 <Error Id="1713" Message="!(loc.Error1713)" />
179 <Error Id="1714">!(loc.Error1714)</Error> 178 <Error Id="1714" Message="!(loc.Error1714)" />
180 <Error Id="1715">!(loc.Error1715)</Error> 179 <Error Id="1715" Message="!(loc.Error1715)" />
181 <Error Id="1716">!(loc.Error1716)</Error> 180 <Error Id="1716" Message="!(loc.Error1716)" />
182 <Error Id="1717">!(loc.Error1717)</Error> 181 <Error Id="1717" Message="!(loc.Error1717)" />
183 <Error Id="1718">!(loc.Error1718)</Error> 182 <Error Id="1718" Message="!(loc.Error1718)" />
184 <Error Id="1719">!(loc.Error1719)</Error> 183 <Error Id="1719" Message="!(loc.Error1719)" />
185 <Error Id="1720">!(loc.Error1720)</Error> 184 <Error Id="1720" Message="!(loc.Error1720)" />
186 <Error Id="1721">!(loc.Error1721)</Error> 185 <Error Id="1721" Message="!(loc.Error1721)" />
187 <Error Id="1722">!(loc.Error1722)</Error> 186 <Error Id="1722" Message="!(loc.Error1722)" />
188 <Error Id="1723">!(loc.Error1723)</Error> 187 <Error Id="1723" Message="!(loc.Error1723)" />
189 <Error Id="1724">!(loc.Error1724)</Error> 188 <Error Id="1724" Message="!(loc.Error1724)" />
190 <Error Id="1725">!(loc.Error1725)</Error> 189 <Error Id="1725" Message="!(loc.Error1725)" />
191 <Error Id="1726">!(loc.Error1726)</Error> 190 <Error Id="1726" Message="!(loc.Error1726)" />
192 <Error Id="1727">!(loc.Error1727)</Error> 191 <Error Id="1727" Message="!(loc.Error1727)" />
193 <Error Id="1728">!(loc.Error1728)</Error> 192 <Error Id="1728" Message="!(loc.Error1728)" />
194 <Error Id="1729">!(loc.Error1729)</Error> 193 <Error Id="1729" Message="!(loc.Error1729)" />
195 <Error Id="1730">!(loc.Error1730)</Error> 194 <Error Id="1730" Message="!(loc.Error1730)" />
196 <Error Id="1731">!(loc.Error1731)</Error> 195 <Error Id="1731" Message="!(loc.Error1731)" />
197 <Error Id="1732">!(loc.Error1732)</Error> 196 <Error Id="1732" Message="!(loc.Error1732)" />
198 <Error Id="1801">!(loc.Error1801)</Error> 197 <Error Id="1801" Message="!(loc.Error1801)" />
199 <Error Id="1802">!(loc.Error1802)</Error> 198 <Error Id="1802" Message="!(loc.Error1802)" />
200 <Error Id="1803">!(loc.Error1803)</Error> 199 <Error Id="1803" Message="!(loc.Error1803)" />
201 <Error Id="1804">!(loc.Error1804)</Error> 200 <Error Id="1804" Message="!(loc.Error1804)" />
202 <Error Id="1805">!(loc.Error1805)</Error> 201 <Error Id="1805" Message="!(loc.Error1805)" />
203 <Error Id="1806">!(loc.Error1806)</Error> 202 <Error Id="1806" Message="!(loc.Error1806)" />
204 <Error Id="1807">!(loc.Error1807)</Error> 203 <Error Id="1807" Message="!(loc.Error1807)" />
205 <Error Id="1901">!(loc.Error1901)</Error> 204 <Error Id="1901" Message="!(loc.Error1901)" />
206 <Error Id="1902">!(loc.Error1902)</Error> 205 <Error Id="1902" Message="!(loc.Error1902)" />
207 <Error Id="1903">!(loc.Error1903)</Error> 206 <Error Id="1903" Message="!(loc.Error1903)" />
208 <Error Id="1904">!(loc.Error1904)</Error> 207 <Error Id="1904" Message="!(loc.Error1904)" />
209 <Error Id="1905">!(loc.Error1905)</Error> 208 <Error Id="1905" Message="!(loc.Error1905)" />
210 <Error Id="1906">!(loc.Error1906)</Error> 209 <Error Id="1906" Message="!(loc.Error1906)" />
211 <Error Id="1907">!(loc.Error1907)</Error> 210 <Error Id="1907" Message="!(loc.Error1907)" />
212 <Error Id="1908">!(loc.Error1908)</Error> 211 <Error Id="1908" Message="!(loc.Error1908)" />
213 <Error Id="1909">!(loc.Error1909)</Error> 212 <Error Id="1909" Message="!(loc.Error1909)" />
214 <Error Id="1910">!(loc.Error1910)</Error> 213 <Error Id="1910" Message="!(loc.Error1910)" />
215 <Error Id="1911">!(loc.Error1911)</Error> 214 <Error Id="1911" Message="!(loc.Error1911)" />
216 <Error Id="1912">!(loc.Error1912)</Error> 215 <Error Id="1912" Message="!(loc.Error1912)" />
217 <Error Id="1913">!(loc.Error1913)</Error> 216 <Error Id="1913" Message="!(loc.Error1913)" />
218 <Error Id="1914">!(loc.Error1914)</Error> 217 <Error Id="1914" Message="!(loc.Error1914)" />
219 <Error Id="1915">!(loc.Error1915)</Error> 218 <Error Id="1915" Message="!(loc.Error1915)" />
220 <Error Id="1916">!(loc.Error1916)</Error> 219 <Error Id="1916" Message="!(loc.Error1916)" />
221 <Error Id="1917">!(loc.Error1917)</Error> 220 <Error Id="1917" Message="!(loc.Error1917)" />
222 <Error Id="1918">!(loc.Error1918)</Error> 221 <Error Id="1918" Message="!(loc.Error1918)" />
223 <Error Id="1919">!(loc.Error1919)</Error> 222 <Error Id="1919" Message="!(loc.Error1919)" />
224 <Error Id="1920">!(loc.Error1920)</Error> 223 <Error Id="1920" Message="!(loc.Error1920)" />
225 <Error Id="1921">!(loc.Error1921)</Error> 224 <Error Id="1921" Message="!(loc.Error1921)" />
226 <Error Id="1922">!(loc.Error1922)</Error> 225 <Error Id="1922" Message="!(loc.Error1922)" />
227 <Error Id="1923">!(loc.Error1923)</Error> 226 <Error Id="1923" Message="!(loc.Error1923)" />
228 <Error Id="1924">!(loc.Error1924)</Error> 227 <Error Id="1924" Message="!(loc.Error1924)" />
229 <Error Id="1925">!(loc.Error1925)</Error> 228 <Error Id="1925" Message="!(loc.Error1925)" />
230 <Error Id="1926">!(loc.Error1926)</Error> 229 <Error Id="1926" Message="!(loc.Error1926)" />
231 <Error Id="1927">!(loc.Error1927)</Error> 230 <Error Id="1927" Message="!(loc.Error1927)" />
232 <Error Id="1928">!(loc.Error1928)</Error> 231 <Error Id="1928" Message="!(loc.Error1928)" />
233 <Error Id="1929">!(loc.Error1929)</Error> 232 <Error Id="1929" Message="!(loc.Error1929)" />
234 <Error Id="1930">!(loc.Error1930)</Error> 233 <Error Id="1930" Message="!(loc.Error1930)" />
235 <Error Id="1931">!(loc.Error1931)</Error> 234 <Error Id="1931" Message="!(loc.Error1931)" />
236 <Error Id="1932">!(loc.Error1932)</Error> 235 <Error Id="1932" Message="!(loc.Error1932)" />
237 <Error Id="1933">!(loc.Error1933)</Error> 236 <Error Id="1933" Message="!(loc.Error1933)" />
238 <Error Id="1934">!(loc.Error1934)</Error> 237 <Error Id="1934" Message="!(loc.Error1934)" />
239 <Error Id="1935">!(loc.Error1935)</Error> 238 <Error Id="1935" Message="!(loc.Error1935)" />
240 <Error Id="1936">!(loc.Error1936)</Error> 239 <Error Id="1936" Message="!(loc.Error1936)" />
241 <Error Id="1937">!(loc.Error1937)</Error> 240 <Error Id="1937" Message="!(loc.Error1937)" />
242 <Error Id="1938">!(loc.Error1938)</Error> 241 <Error Id="1938" Message="!(loc.Error1938)" />
243 </UI> 242 </UI>
244 </Fragment> 243 </Fragment>
245</Wix> 244</Wix>
diff --git a/src/wixlib/ExitDialog.wxs b/src/wixlib/ExitDialog.wxs
index 545b0224..8f7dec1f 100644
--- a/src/wixlib/ExitDialog.wxs
+++ b/src/wixlib/ExitDialog.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -13,12 +12,8 @@
13 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 12 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
14 <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" /> 13 <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
15 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" /> 14 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
16 <Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]"> 15 <Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]" ShowCondition="WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed" />
17 <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition> 16 <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]" ShowCondition="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed" />
18 </Control>
19 <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
20 <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
21 </Control>
22 </Dialog> 17 </Dialog>
23 18
24 <InstallUISequence> 19 <InstallUISequence>
diff --git a/src/wixlib/FatalError.wxs b/src/wixlib/FatalError.wxs
index 9ba68824..a383b9b3 100644
--- a/src/wixlib/FatalError.wxs
+++ b/src/wixlib/FatalError.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="FatalError" Width="370" Height="270" Title="!(loc.FatalError_Title)"> 7 <Dialog Id="FatalError" Width="370" Height="270" Title="!(loc.FatalError_Title)">
9 <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)"> 8 <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
10 <Publish Event="EndDialog" Value="Exit">1</Publish> 9 <Publish Event="EndDialog" Value="Exit" />
11 </Control> 10 </Control>
12 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" /> 11 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
13 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" /> 12 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" />
diff --git a/src/wixlib/FeaturesDlg.wxs b/src/wixlib/FeaturesDlg.wxs
index 0e10414c..04a93154 100644
--- a/src/wixlib/FeaturesDlg.wxs
+++ b/src/wixlib/FeaturesDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -8,46 +7,38 @@
8 <Dialog Id="FeaturesDlg" Width="370" Height="270" Title="!(loc.FeaturesDlg_Title)" TrackDiskSpace="yes"> 7 <Dialog Id="FeaturesDlg" Width="370" Height="270" Title="!(loc.FeaturesDlg_Title)" TrackDiskSpace="yes">
9 <Control Id="Tree" Type="SelectionTree" X="20" Y="55" Width="330" Height="121" Property="_BrowseProperty" TabSkip="no" Text="!(loc.FeaturesDlgTree)" /> 8 <Control Id="Tree" Type="SelectionTree" X="20" Y="55" Width="330" Height="121" Property="_BrowseProperty" TabSkip="no" Text="!(loc.FeaturesDlgTree)" />
10 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 9 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
11 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgInstall)"> 10 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgInstall)" ShowCondition="NOT Installed AND ALLUSERS" DefaultCondition="NOT Installed">
12 <Condition Action="show">NOT Installed AND ALLUSERS</Condition> 11 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
13 <Condition Action="default">NOT Installed</Condition> 12 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
14 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 13 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
15 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 14 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
16 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 15 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
17 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 16 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
18 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
19 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
20 </Control> 17 </Control>
21 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgInstall)"> 18 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgInstall)" ShowCondition="NOT Installed AND NOT ALLUSERS" DefaultCondition="NOT Installed">
22 <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition> 19 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
23 <Condition Action="default">NOT Installed</Condition> 20 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
24 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 21 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
25 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 22 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
26 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 23 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
27 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 24 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
28 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
29 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
30 </Control> 25 </Control>
31 <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgChange)"> 26 <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgChange)" ShowCondition="Installed AND ALLUSERS AND (ADDLOCAL OR REMOVE)" DefaultCondition="Installed">
32 <Condition Action="show">Installed AND ALLUSERS AND (ADDLOCAL OR REMOVE)</Condition> 27 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
33 <Condition Action="default">Installed</Condition> 28 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
34 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 29 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
35 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 30 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
36 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 31 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
37 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
38 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
39 </Control> 32 </Control>
40 <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgChange)"> 33 <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Text="!(loc.FeaturesDlgChange)" ShowCondition="Installed AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))" DefaultCondition="Installed">
41 <Condition Action="show">Installed AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))</Condition> 34 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
42 <Condition Action="default">Installed</Condition> 35 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
43 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 36 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
44 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 37 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
45 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 38 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
46 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
47 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
48 </Control> 39 </Control>
49 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 40 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
50 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 41 <Publish Event="SpawnDialog" Value="CancelDlg" />
51 </Control> 42 </Control>
52 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FeaturesDlgBannerBitmap)" /> 43 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FeaturesDlgBannerBitmap)" />
53 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> 44 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
diff --git a/src/wixlib/FilesInUse.wxs b/src/wixlib/FilesInUse.wxs
index 38062f0b..7892a5d5 100644
--- a/src/wixlib/FilesInUse.wxs
+++ b/src/wixlib/FilesInUse.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,13 +6,13 @@
7 <UI> 6 <UI>
8 <Dialog Id="FilesInUse" Width="370" Height="270" Title="!(loc.FilesInUse_Title)" KeepModeless="yes"> 7 <Dialog Id="FilesInUse" Width="370" Height="270" Title="!(loc.FilesInUse_Title)" KeepModeless="yes">
9 <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIRetry)"> 8 <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIRetry)">
10 <Publish Event="EndDialog" Value="Retry">1</Publish> 9 <Publish Event="EndDialog" Value="Retry" />
11 </Control> 10 </Control>
12 <Control Id="Ignore" Type="PushButton" X="235" Y="243" Width="56" Height="17" Text="!(loc.WixUIIgnore)"> 11 <Control Id="Ignore" Type="PushButton" X="235" Y="243" Width="56" Height="17" Text="!(loc.WixUIIgnore)">
13 <Publish Event="EndDialog" Value="Ignore">1</Publish> 12 <Publish Event="EndDialog" Value="Ignore" />
14 </Control> 13 </Control>
15 <Control Id="Exit" Type="PushButton" X="166" Y="243" Width="56" Height="17" Text="!(loc.FilesInUseExit)"> 14 <Control Id="Exit" Type="PushButton" X="166" Y="243" Width="56" Height="17" Text="!(loc.FilesInUseExit)">
16 <Publish Event="EndDialog" Value="Exit">1</Publish> 15 <Publish Event="EndDialog" Value="Exit" />
17 </Control> 16 </Control>
18 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" /> 17 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" />
19 <Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="30" Text="!(loc.FilesInUseText)" /> 18 <Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="30" Text="!(loc.FilesInUseText)" />
diff --git a/src/wixlib/InstallDirDlg.wxs b/src/wixlib/InstallDirDlg.wxs
index 4e3d5745..9eea0a01 100644
--- a/src/wixlib/InstallDirDlg.wxs
+++ b/src/wixlib/InstallDirDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -9,7 +8,7 @@
9 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" /> 8 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
10 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 9 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
11 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 10 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
12 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 11 <Publish Event="SpawnDialog" Value="CancelDlg" />
13 </Control> 12 </Control>
14 13
15 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" /> 14 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
diff --git a/src/wixlib/InstallScopeDlg.wxs b/src/wixlib/InstallScopeDlg.wxs
index 35c01fc1..cfcd1179 100644
--- a/src/wixlib/InstallScopeDlg.wxs
+++ b/src/wixlib/InstallScopeDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -11,26 +10,19 @@
11 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 10 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
12 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgDescription)" /> 11 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgDescription)" />
13 <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgTitle)" /> 12 <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgTitle)" />
14 <Control Id="BothScopes" Type="RadioButtonGroup" X="20" Y="55" Width="330" Height="120" Property="WixAppFolder" Hidden="yes"> 13 <Control Id="BothScopes" Type="RadioButtonGroup" X="20" Y="55" Width="330" Height="120" Property="WixAppFolder" Hidden="yes" ShowCondition="Privileged AND (!(wix.WixUISupportPerUser) AND !(wix.WixUISupportPerMachine))">
15 <RadioButtonGroup Property="WixAppFolder"> 14 <RadioButtonGroup Property="WixAppFolder">
16 <RadioButton Value="WixPerUserFolder" X="0" Y="0" Width="295" Height="16" Text="!(loc.InstallScopeDlgPerUser)" /> 15 <RadioButton Value="WixPerUserFolder" X="0" Y="0" Width="295" Height="16" Text="!(loc.InstallScopeDlgPerUser)" />
17 <RadioButton Value="WixPerMachineFolder" X="0" Y="60" Width="295" Height="16" Text="!(loc.InstallScopeDlgPerMachine)" /> 16 <RadioButton Value="WixPerMachineFolder" X="0" Y="60" Width="295" Height="16" Text="!(loc.InstallScopeDlgPerMachine)" />
18 </RadioButtonGroup> 17 </RadioButtonGroup>
19 <Condition Action="show">Privileged AND (!(wix.WixUISupportPerUser) AND !(wix.WixUISupportPerMachine))</Condition>
20 </Control>
21 <Control Id="PerUserDescription" Type="Text" X="33" Y="70" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgPerUserDescription)">
22 <Condition Action="show">!(wix.WixUISupportPerUser)</Condition>
23 </Control>
24 <Control Id="NoPerUserDescription" Type="Text" X="33" Y="70" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgNoPerUserDescription)">
25 <Condition Action="show">NOT !(wix.WixUISupportPerUser)</Condition>
26 </Control>
27 <Control Id="PerMachineDescription" Type="Text" X="33" Y="131" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgPerMachineDescription)">
28 <Condition Action="show">Privileged</Condition>
29 </Control> 18 </Control>
19 <Control Id="PerUserDescription" Type="Text" X="33" Y="70" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgPerUserDescription)" ShowCondition="!(wix.WixUISupportPerUser)" />
20 <Control Id="NoPerUserDescription" Type="Text" X="33" Y="70" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgNoPerUserDescription)" ShowCondition="NOT !(wix.WixUISupportPerUser)" />
21 <Control Id="PerMachineDescription" Type="Text" X="33" Y="131" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgPerMachineDescription)" ShowCondition="Privileged" />
30 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 22 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
31 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" /> 23 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
32 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 24 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
33 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 25 <Publish Event="SpawnDialog" Value="CancelDlg" />
34 </Control> 26 </Control>
35 </Dialog> 27 </Dialog>
36 </UI> 28 </UI>
diff --git a/src/wixlib/InvalidDirDlg.wxs b/src/wixlib/InvalidDirDlg.wxs
index 805fb31a..8c3a6fc7 100644
--- a/src/wixlib/InvalidDirDlg.wxs
+++ b/src/wixlib/InvalidDirDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="InvalidDirDlg" Width="260" Height="85" Title="!(loc.InvalidDirDlg_Title)"> 7 <Dialog Id="InvalidDirDlg" Width="260" Height="85" Title="!(loc.InvalidDirDlg_Title)">
9 <Control Id="OK" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)"> 8 <Control Id="OK" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)">
10 <Publish Event="EndDialog" Value="Return">1</Publish> 9 <Publish Event="EndDialog" Value="Return" />
11 </Control> 10 </Control>
12 <Control Id="Text" Type="Text" X="48" Y="22" Width="194" Height="30" Text="!(loc.InvalidDirDlgText)" /> 11 <Control Id="Text" Type="Text" X="48" Y="22" Width="194" Height="30" Text="!(loc.InvalidDirDlgText)" />
13 <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.InvalidDirDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.InvalidDirDlgIcon)" /> 12 <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.InvalidDirDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.InvalidDirDlgIcon)" />
diff --git a/src/wixlib/LicenseAgreementDlg.wxs b/src/wixlib/LicenseAgreementDlg.wxs
index 39f678f4..aaa0611d 100644
--- a/src/wixlib/LicenseAgreementDlg.wxs
+++ b/src/wixlib/LicenseAgreementDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -13,16 +12,14 @@
13 <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" /> 12 <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
14 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" /> 13 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" />
15 <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)"> 14 <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
16 <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish> 15 <Publish Event="DoAction" Value="WixUIPrintEula" />
17 </Control> 16 </Control>
18 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 17 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
19 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"> 18 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;">
20 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 19 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
21 <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
22 <Condition Action="enable">LicenseAccepted = "1"</Condition>
23 </Control> 20 </Control>
24 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 21 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
25 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 22 <Publish Event="SpawnDialog" Value="CancelDlg" />
26 </Control> 23 </Control>
27 <Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="140" Sunken="yes" TabSkip="no"> 24 <Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="140" Sunken="yes" TabSkip="no">
28 <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" /> 25 <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" />
diff --git a/src/wixlib/MaintenanceTypeDlg.wxs b/src/wixlib/MaintenanceTypeDlg.wxs
index c86a23d7..551bac54 100644
--- a/src/wixlib/MaintenanceTypeDlg.wxs
+++ b/src/wixlib/MaintenanceTypeDlg.wxs
@@ -1,45 +1,29 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment> 5 <Fragment>
7 <UI> 6 <UI>
8 <Dialog Id="MaintenanceTypeDlg" Width="370" Height="270" Title="!(loc.MaintenanceTypeDlg_Title)"> 7 <Dialog Id="MaintenanceTypeDlg" Width="370" Height="270" Title="!(loc.MaintenanceTypeDlg_Title)">
9 <Control Id="ChangeButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgChangeButtonTooltip)" Default="yes" Text="!(loc.MaintenanceTypeDlgChangeButton)"> 8 <Control Id="ChangeButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgChangeButtonTooltip)" Default="yes" Text="!(loc.MaintenanceTypeDlgChangeButton)" DisableCondition="ARPNOMODIFY">
10 <Publish Property="WixUI_InstallMode" Value="Change">1</Publish> 9 <Publish Property="WixUI_InstallMode" Value="Change" />
11 <Condition Action="disable">ARPNOMODIFY</Condition>
12 </Control> 10 </Control>
13 <Control Id="ChangeText" Type="Text" X="60" Y="85" Width="280" Height="20" Text="!(loc.MaintenanceTypeDlgChangeText)"> 11 <Control Id="ChangeText" Type="Text" X="60" Y="85" Width="280" Height="20" Text="!(loc.MaintenanceTypeDlgChangeText)" HideCondition="ARPNOMODIFY" />
14 <Condition Action="hide">ARPNOMODIFY</Condition> 12 <Control Id="ChangeDisabledText" Type="Text" X="60" Y="85" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgChangeDisabledText)" Hidden="yes" ShowCondition="ARPNOMODIFY" />
13 <Control Id="RepairButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRepairButton)" DisableCondition="ARPNOREPAIR">
14 <Publish Property="WixUI_InstallMode" Value="Repair" />
15 </Control> 15 </Control>
16 <Control Id="ChangeDisabledText" Type="Text" X="60" Y="85" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgChangeDisabledText)" Hidden="yes"> 16 <Control Id="RepairText" Type="Text" X="60" Y="138" Width="280" Height="30" Text="!(loc.MaintenanceTypeDlgRepairText)" HideCondition="ARPNOREPAIR" />
17 <Condition Action="show">ARPNOMODIFY</Condition> 17 <Control Id="RepairDisabledText" Type="Text" X="60" Y="138" Width="280" Height="30" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRepairDisabledText)" Hidden="yes" ShowCondition="ARPNOREPAIR" />
18 </Control> 18 <Control Id="RemoveButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRemoveButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRemoveButton)" DisableCondition="ARPNOREMOVE">
19 <Control Id="RepairButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRepairButton)"> 19 <Publish Property="WixUI_InstallMode" Value="Remove" />
20 <Publish Property="WixUI_InstallMode" Value="Repair">1</Publish>
21 <Condition Action="disable">ARPNOREPAIR</Condition>
22 </Control>
23 <Control Id="RepairText" Type="Text" X="60" Y="138" Width="280" Height="30" Text="!(loc.MaintenanceTypeDlgRepairText)">
24 <Condition Action="hide">ARPNOREPAIR</Condition>
25 </Control>
26 <Control Id="RepairDisabledText" Type="Text" X="60" Y="138" Width="280" Height="30" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRepairDisabledText)" Hidden="yes">
27 <Condition Action="show">ARPNOREPAIR</Condition>
28 </Control>
29 <Control Id="RemoveButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRemoveButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRemoveButton)">
30 <Publish Property="WixUI_InstallMode" Value="Remove">1</Publish>
31 <Condition Action="disable">ARPNOREMOVE</Condition>
32 </Control>
33 <Control Id="RemoveText" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveText)">
34 <Condition Action="hide">ARPNOREMOVE</Condition>
35 </Control>
36 <Control Id="RemoveDisabledText" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes">
37 <Condition Action="show">ARPNOREMOVE</Condition>
38 </Control> 20 </Control>
21 <Control Id="RemoveText" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveText)" HideCondition="ARPNOREMOVE" />
22 <Control Id="RemoveDisabledText" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes" ShowCondition="ARPNOREMOVE" />
39 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 23 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
40 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" /> 24 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
41 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 25 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
42 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 26 <Publish Event="SpawnDialog" Value="CancelDlg" />
43 </Control> 27 </Control>
44 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.MaintenanceTypeDlgBannerBitmap)" /> 28 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.MaintenanceTypeDlgBannerBitmap)" />
45 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> 29 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
diff --git a/src/wixlib/MaintenanceWelcomeDlg.wxs b/src/wixlib/MaintenanceWelcomeDlg.wxs
index 9bb697a8..7208aff3 100644
--- a/src/wixlib/MaintenanceWelcomeDlg.wxs
+++ b/src/wixlib/MaintenanceWelcomeDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,10 +6,10 @@
7 <UI> 6 <UI>
8 <Dialog Id="MaintenanceWelcomeDlg" Width="370" Height="270" Title="!(loc.MaintenanceWelcomeDlg_Title)"> 7 <Dialog Id="MaintenanceWelcomeDlg" Width="370" Height="270" Title="!(loc.MaintenanceWelcomeDlg_Title)">
9 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"> 8 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
10 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 9 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
11 </Control> 10 </Control>
12 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 11 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
13 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 12 <Publish Event="SpawnDialog" Value="CancelDlg" />
14 </Control> 13 </Control>
15 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.MaintenanceWelcomeDlgBitmap)" /> 14 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.MaintenanceWelcomeDlgBitmap)" />
16 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> 15 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
@@ -20,7 +19,7 @@
20 </Dialog> 19 </Dialog>
21 20
22 <InstallUISequence> 21 <InstallUISequence>
23 <Show Dialog="MaintenanceWelcomeDlg" Before="ProgressDlg" Overridable="yes">Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH</Show> 22 <Show Dialog="MaintenanceWelcomeDlg" Before="ProgressDlg" Overridable="yes" Condition="Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH" />
24 </InstallUISequence> 23 </InstallUISequence>
25 </UI> 24 </UI>
26 </Fragment> 25 </Fragment>
diff --git a/src/wixlib/MsiRMFilesInUse.wxs b/src/wixlib/MsiRMFilesInUse.wxs
index c6004253..9881f0e6 100644
--- a/src/wixlib/MsiRMFilesInUse.wxs
+++ b/src/wixlib/MsiRMFilesInUse.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -8,11 +7,11 @@
8 <Property Id="WixUIRMOption" Value="UseRM" /> 7 <Property Id="WixUIRMOption" Value="UseRM" />
9 <Dialog Id="MsiRMFilesInUse" Width="370" Height="270" Title="!(loc.MsiRMFilesInUse_Title)" KeepModeless="yes"> 8 <Dialog Id="MsiRMFilesInUse" Width="370" Height="270" Title="!(loc.MsiRMFilesInUse_Title)" KeepModeless="yes">
10 <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)"> 9 <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
11 <Publish Event="EndDialog" Value="Return">1</Publish> 10 <Publish Event="EndDialog" Value="Return" />
12 <Publish Event="RMShutdownAndRestart" Value="0">WixUIRMOption~="UseRM"</Publish> 11 <Publish Event="RMShutdownAndRestart" Value="0" Condition="WixUIRMOption~=&quot;UseRM&quot;" />
13 </Control> 12 </Control>
14 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 13 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
15 <Publish Event="EndDialog" Value="Exit">1</Publish> 14 <Publish Event="EndDialog" Value="Exit" />
16 </Control> 15 </Control>
17 16
18 <Control Id="ShutdownOption" Type="RadioButtonGroup" X="26" Y="190" Width="305" Height="45" Property="WixUIRMOption"> 17 <Control Id="ShutdownOption" Type="RadioButtonGroup" X="26" Y="190" Width="305" Height="45" Property="WixUIRMOption">
diff --git a/src/wixlib/OutOfDiskDlg.wxs b/src/wixlib/OutOfDiskDlg.wxs
index aff7a6fc..e46c10b2 100644
--- a/src/wixlib/OutOfDiskDlg.wxs
+++ b/src/wixlib/OutOfDiskDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="OutOfDiskDlg" Width="370" Height="270" Title="!(loc.OutOfDiskDlg_Title)"> 7 <Dialog Id="OutOfDiskDlg" Width="370" Height="270" Title="!(loc.OutOfDiskDlg_Title)">
9 <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)"> 8 <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)">
10 <Publish Event="EndDialog" Value="Return">1</Publish> 9 <Publish Event="EndDialog" Value="Return" />
11 </Control> 10 </Control>
12 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.OutOfDiskDlgBannerBitmap)" /> 11 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.OutOfDiskDlgBannerBitmap)" />
13 <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="60" Text="!(loc.OutOfDiskDlgText)" /> 12 <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="60" Text="!(loc.OutOfDiskDlgText)" />
diff --git a/src/wixlib/OutOfRbDiskDlg.wxs b/src/wixlib/OutOfRbDiskDlg.wxs
index e2f7627b..79a1470f 100644
--- a/src/wixlib/OutOfRbDiskDlg.wxs
+++ b/src/wixlib/OutOfRbDiskDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,11 +6,11 @@
7 <UI> 6 <UI>
8 <Dialog Id="OutOfRbDiskDlg" Width="370" Height="270" Title="!(loc.OutOfRbDiskDlg_Title)"> 7 <Dialog Id="OutOfRbDiskDlg" Width="370" Height="270" Title="!(loc.OutOfRbDiskDlg_Title)">
9 <Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUINo)"> 8 <Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUINo)">
10 <Publish Event="EndDialog" Value="Return">1</Publish> 9 <Publish Event="EndDialog" Value="Return" />
11 </Control> 10 </Control>
12 <Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="!(loc.WixUIYes)"> 11 <Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="!(loc.WixUIYes)">
13 <Publish Event="EnableRollback" Value="False">1</Publish> 12 <Publish Event="EnableRollback" Value="False" />
14 <Publish Event="EndDialog" Value="Return">1</Publish> 13 <Publish Event="EndDialog" Value="Return" />
15 </Control> 14 </Control>
16 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.OutOfRbDiskDlgBannerBitmap)" /> 15 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.OutOfRbDiskDlgBannerBitmap)" />
17 <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="90" Text="!(loc.OutOfRbDiskDlgText) !(loc.OutOfRbDiskDlgText2)" /> 16 <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="90" Text="!(loc.OutOfRbDiskDlgText) !(loc.OutOfRbDiskDlgText2)" />
diff --git a/src/wixlib/PrepareDlg.wxs b/src/wixlib/PrepareDlg.wxs
index f2461a2c..1b22b04f 100644
--- a/src/wixlib/PrepareDlg.wxs
+++ b/src/wixlib/PrepareDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="PrepareDlg" Width="370" Height="270" Title="!(loc.PrepareDlg_Title)" Modeless="yes"> 7 <Dialog Id="PrepareDlg" Width="370" Height="270" Title="!(loc.PrepareDlg_Title)" Modeless="yes">
9 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)"> 8 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)">
10 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 9 <Publish Event="SpawnDialog" Value="CancelDlg" />
11 </Control> 10 </Control>
12 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.PrepareDlgBitmap)" /> 11 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.PrepareDlgBitmap)" />
13 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 12 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
diff --git a/src/wixlib/ProgressDlg.wxs b/src/wixlib/ProgressDlg.wxs
index 63af2a72..057b104f 100644
--- a/src/wixlib/ProgressDlg.wxs
+++ b/src/wixlib/ProgressDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="ProgressDlg" Width="370" Height="270" Title="!(loc.ProgressDlg_Title)" Modeless="yes"> 7 <Dialog Id="ProgressDlg" Width="370" Height="270" Title="!(loc.ProgressDlg_Title)" Modeless="yes">
9 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)"> 8 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)">
10 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 9 <Publish Event="SpawnDialog" Value="CancelDlg" />
11 </Control> 10 </Control>
12 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.ProgressDlgBannerBitmap)" /> 11 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.ProgressDlgBannerBitmap)" />
13 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> 12 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
@@ -15,36 +14,16 @@
15 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> 14 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
16 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 15 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
17 <!-- mutually exclusive title and description strings overlap --> 16 <!-- mutually exclusive title and description strings overlap -->
18 <Control Id="TextInstalling" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextInstalling)"> 17 <Control Id="TextInstalling" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextInstalling)" ShowCondition="NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)" />
19 <Condition Action="show">NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)</Condition> 18 <Control Id="TitleInstalling" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleInstalling)" ShowCondition="NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)" />
20 </Control> 19 <Control Id="TextChanging" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextChanging)" ShowCondition="WixUI_InstallMode = &quot;Change&quot;" />
21 <Control Id="TitleInstalling" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleInstalling)"> 20 <Control Id="TitleChanging" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleChanging)" ShowCondition="WixUI_InstallMode = &quot;Change&quot;" />
22 <Condition Action="show">NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)</Condition> 21 <Control Id="TextRepairing" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRepairing)" ShowCondition="WixUI_InstallMode = &quot;Repair&quot;" />
23 </Control> 22 <Control Id="TitleRepairing" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRepairing)" ShowCondition="WixUI_InstallMode = &quot;Repair&quot;" />
24 <Control Id="TextChanging" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextChanging)"> 23 <Control Id="TextRemoving" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRemoving)" ShowCondition="WixUI_InstallMode = &quot;Remove&quot;" />
25 <Condition Action="show">WixUI_InstallMode = "Change"</Condition> 24 <Control Id="TitleRemoving" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRemoving)" ShowCondition="WixUI_InstallMode = &quot;Remove&quot;" />
26 </Control> 25 <Control Id="TextUpdating" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextUpdating)" ShowCondition="WixUI_InstallMode = &quot;Update&quot;" />
27 <Control Id="TitleChanging" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleChanging)"> 26 <Control Id="TitleUpdating" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleUpdating)" ShowCondition="WixUI_InstallMode = &quot;Update&quot;" />
28 <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
29 </Control>
30 <Control Id="TextRepairing" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRepairing)">
31 <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
32 </Control>
33 <Control Id="TitleRepairing" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRepairing)">
34 <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
35 </Control>
36 <Control Id="TextRemoving" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRemoving)">
37 <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
38 </Control>
39 <Control Id="TitleRemoving" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRemoving)">
40 <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
41 </Control>
42 <Control Id="TextUpdating" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextUpdating)">
43 <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
44 </Control>
45 <Control Id="TitleUpdating" Type="Text" X="20" Y="15" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleUpdating)">
46 <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
47 </Control>
48 <Control Id="ActionText" Type="Text" X="70" Y="100" Width="285" Height="10"> 27 <Control Id="ActionText" Type="Text" X="70" Y="100" Width="285" Height="10">
49 <Subscribe Event="ActionText" Attribute="Text" /> 28 <Subscribe Event="ActionText" Attribute="Text" />
50 </Control> 29 </Control>
diff --git a/src/wixlib/ResumeDlg.wxs b/src/wixlib/ResumeDlg.wxs
index edfb3021..67e1cc58 100644
--- a/src/wixlib/ResumeDlg.wxs
+++ b/src/wixlib/ResumeDlg.wxs
@@ -1,31 +1,28 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment> 5 <Fragment>
7 <UI> 6 <UI>
8 <Dialog Id="ResumeDlg" Width="370" Height="270" Title="!(loc.ResumeDlg_Title)"> 7 <Dialog Id="ResumeDlg" Width="370" Height="270" Title="!(loc.ResumeDlg_Title)">
9 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.ResumeDlgInstall)" Hidden="yes"> 8 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.ResumeDlgInstall)" Hidden="yes" ShowCondition="ALLUSERS">
10 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 9 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
11 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 10 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
12 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 11 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
13 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 12 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
14 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 13 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
15 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 14 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
16 <Condition Action="show">ALLUSERS</Condition>
17 </Control> 15 </Control>
18 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.ResumeDlgInstall)" Hidden="yes"> 16 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.ResumeDlgInstall)" Hidden="yes" ShowCondition="NOT ALLUSERS">
19 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 17 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
20 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 18 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
21 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 19 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
22 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 20 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
23 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 21 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
24 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 22 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
25 <Condition Action="show">NOT ALLUSERS</Condition>
26 </Control> 23 </Control>
27 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 24 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
28 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 25 <Publish Event="SpawnDialog" Value="CancelDlg" />
29 </Control> 26 </Control>
30 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ResumeDlgBitmap)" /> 27 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ResumeDlgBitmap)" />
31 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> 28 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
@@ -35,7 +32,7 @@
35 </Dialog> 32 </Dialog>
36 33
37 <InstallUISequence> 34 <InstallUISequence>
38 <Show Dialog="ResumeDlg" Before="ProgressDlg" Overridable="yes">Installed AND (RESUME OR Preselected)</Show> 35 <Show Dialog="ResumeDlg" Before="ProgressDlg" Overridable="yes" Condition="Installed AND (RESUME OR Preselected)" />
39 </InstallUISequence> 36 </InstallUISequence>
40 </UI> 37 </UI>
41 </Fragment> 38 </Fragment>
diff --git a/src/wixlib/SetupTypeDlg.wxs b/src/wixlib/SetupTypeDlg.wxs
index 97683f58..214e440a 100644
--- a/src/wixlib/SetupTypeDlg.wxs
+++ b/src/wixlib/SetupTypeDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,20 +6,20 @@
7 <UI> 6 <UI>
8 <Dialog Id="SetupTypeDlg" Width="370" Height="270" Title="!(loc.SetupTypeDlg_Title)"> 7 <Dialog Id="SetupTypeDlg" Width="370" Height="270" Title="!(loc.SetupTypeDlg_Title)">
9 <Control Id="TypicalButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgTypicalButtonTooltip)" Default="yes" Text="!(loc.SetupTypeDlgTypicalButton)"> 8 <Control Id="TypicalButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgTypicalButtonTooltip)" Default="yes" Text="!(loc.SetupTypeDlgTypicalButton)">
10 <Publish Property="WixUI_InstallMode" Value="InstallTypical">1</Publish> 9 <Publish Property="WixUI_InstallMode" Value="InstallTypical" />
11 <Publish Event="SetInstallLevel" Value="3">1</Publish> 10 <Publish Event="SetInstallLevel" Value="3" />
12 </Control> 11 </Control>
13 <Control Id="CustomButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCustomButtonTooltip)" Text="!(loc.SetupTypeDlgCustomButton)"> 12 <Control Id="CustomButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCustomButtonTooltip)" Text="!(loc.SetupTypeDlgCustomButton)">
14 <Publish Property="WixUI_InstallMode" Value="InstallCustom">1</Publish> 13 <Publish Property="WixUI_InstallMode" Value="InstallCustom" />
15 </Control> 14 </Control>
16 <Control Id="CompleteButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCompleteButtonTooltip)" Text="!(loc.SetupTypeDlgCompleteButton)"> 15 <Control Id="CompleteButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCompleteButtonTooltip)" Text="!(loc.SetupTypeDlgCompleteButton)">
17 <Publish Property="WixUI_InstallMode" Value="InstallComplete">1</Publish> 16 <Publish Property="WixUI_InstallMode" Value="InstallComplete" />
18 <Publish Event="SetInstallLevel" Value="1000">1</Publish> 17 <Publish Event="SetInstallLevel" Value="1000" />
19 </Control> 18 </Control>
20 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> 19 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
21 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" /> 20 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
22 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 21 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
23 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 22 <Publish Event="SpawnDialog" Value="CancelDlg" />
24 </Control> 23 </Control>
25 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.SetupTypeDlgBannerBitmap)" /> 24 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.SetupTypeDlgBannerBitmap)" />
26 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> 25 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
diff --git a/src/wixlib/UserExit.wxs b/src/wixlib/UserExit.wxs
index de1e11e8..7c3a07ed 100644
--- a/src/wixlib/UserExit.wxs
+++ b/src/wixlib/UserExit.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="UserExit" Width="370" Height="270" Title="!(loc.UserExit_Title)"> 7 <Dialog Id="UserExit" Width="370" Height="270" Title="!(loc.UserExit_Title)">
9 <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)"> 8 <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
10 <Publish Event="EndDialog" Value="Exit">1</Publish> 9 <Publish Event="EndDialog" Value="Exit" />
11 </Control> 10 </Control>
12 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" /> 11 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
13 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.UserExitBitmap)" /> 12 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.UserExitBitmap)" />
diff --git a/src/wixlib/VerifyReadyDlg.wxs b/src/wixlib/VerifyReadyDlg.wxs
index ae55ea69..77e5512f 100644
--- a/src/wixlib/VerifyReadyDlg.wxs
+++ b/src/wixlib/VerifyReadyDlg.wxs
@@ -1,139 +1,93 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment> 5 <Fragment>
7 <UI> 6 <UI>
8 <Dialog Id="VerifyReadyDlg" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes"> 7 <Dialog Id="VerifyReadyDlg" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
9 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)"> 8 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)" ShowCondition="NOT Installed AND ALLUSERS" EnableCondition="NOT Installed" DefaultCondition="NOT Installed">
10 <Condition Action="show">NOT Installed AND ALLUSERS</Condition> 9 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
11 <Condition Action="enable">NOT Installed</Condition> 10 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
12 <Condition Action="default">NOT Installed</Condition> 11 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
13 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 12 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
14 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 13 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
15 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 14 </Control>
16 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 15 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)" ShowCondition="NOT Installed AND NOT ALLUSERS" EnableCondition="NOT Installed" DefaultCondition="NOT Installed">
17 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 16 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
18 </Control> 17 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
19 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)"> 18 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
20 <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition> 19 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
21 <Condition Action="enable">NOT Installed</Condition> 20 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
22 <Condition Action="default">NOT Installed</Condition> 21 </Control>
23 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 22 <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)" ShowCondition="WixUI_InstallMode = &quot;Change&quot; AND ALLUSERS AND (ADDLOCAL OR REMOVE)" EnableCondition="WixUI_InstallMode = &quot;Change&quot;" DefaultCondition="WixUI_InstallMode = &quot;Change&quot;">
24 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 23 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
25 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 24 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
26 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 25 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
27 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 26 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
28 </Control> 27 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
29 <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)"> 28 </Control>
30 <Condition Action="show">WixUI_InstallMode = "Change" AND ALLUSERS AND (ADDLOCAL OR REMOVE)</Condition> 29 <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)" ShowCondition="WixUI_InstallMode = &quot;Change&quot; AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))" EnableCondition="WixUI_InstallMode = &quot;Change&quot;" DefaultCondition="WixUI_InstallMode = &quot;Change&quot;">
31 <Condition Action="enable">WixUI_InstallMode = "Change"</Condition> 30 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
32 <Condition Action="default">WixUI_InstallMode = "Change"</Condition> 31 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
33 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 32 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
34 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 33 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
35 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 34 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
36 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 35 </Control>
37 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 36 <Control Id="Repair" Type="PushButton" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRepair)" ShowCondition="WixUI_InstallMode = &quot;Repair&quot;" EnableCondition="WixUI_InstallMode = &quot;Repair&quot;" DefaultCondition="WixUI_InstallMode = &quot;Repair&quot;">
38 </Control> 37 <Publish Event="ReinstallMode" Value="ecmus" Condition="OutOfDiskSpace &lt;&gt; 1" />
39 <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)"> 38 <Publish Event="Reinstall" Value="All" Condition="OutOfDiskSpace &lt;&gt; 1" />
40 <Condition Action="show">WixUI_InstallMode = "Change" AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))</Condition> 39 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
41 <Condition Action="enable">WixUI_InstallMode = "Change"</Condition> 40 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
42 <Condition Action="default">WixUI_InstallMode = "Change"</Condition> 41 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
43 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 42 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
44 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 43 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
45 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 44 </Control>
46 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 45 <Control Id="Remove" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)" ShowCondition="WixUI_InstallMode = &quot;Remove&quot; AND ALLUSERS" EnableCondition="WixUI_InstallMode = &quot;Remove&quot;">
47 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 46 <Publish Event="Remove" Value="All" Condition="OutOfDiskSpace &lt;&gt; 1" />
48 </Control> 47 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
49 <Control Id="Repair" Type="PushButton" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRepair)"> 48 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
50 <Condition Action="show">WixUI_InstallMode = "Repair"</Condition> 49 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
51 <Condition Action="enable">WixUI_InstallMode = "Repair"</Condition> 50 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
52 <Condition Action="default">WixUI_InstallMode = "Repair"</Condition> 51 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
53 <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 52 </Control>
54 <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 53 <Control Id="RemoveNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)" ShowCondition="WixUI_InstallMode = &quot;Remove&quot; AND NOT ALLUSERS" EnableCondition="WixUI_InstallMode = &quot;Remove&quot;">
55 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 54 <Publish Event="Remove" Value="All" Condition="OutOfDiskSpace &lt;&gt; 1" />
56 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 55 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
57 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 56 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
58 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 57 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
59 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 58 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
60 </Control> 59 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
61 <Control Id="Remove" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)"> 60 </Control>
62 <Condition Action="show">WixUI_InstallMode = "Remove" AND ALLUSERS</Condition> 61 <Control Id="Update" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)" ShowCondition="WixUI_InstallMode = &quot;Update&quot; AND ALLUSERS" EnableCondition="WixUI_InstallMode = &quot;Update&quot;">
63 <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition> 62 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
64 <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 63 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
65 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 64 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
66 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 65 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
67 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 66 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
68 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 67 </Control>
69 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 68 <Control Id="UpdateNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)" ShowCondition="WixUI_InstallMode = &quot;Update&quot; AND NOT ALLUSERS" EnableCondition="WixUI_InstallMode = &quot;Update&quot;">
70 </Control> 69 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
71 <Control Id="RemoveNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)"> 70 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
72 <Condition Action="show">WixUI_InstallMode = "Remove" AND NOT ALLUSERS</Condition> 71 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
73 <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition> 72 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
74 <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 73 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
75 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
76 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
77 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
78 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
79 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
80 </Control>
81 <Control Id="Update" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
82 <Condition Action="show">WixUI_InstallMode = "Update" AND ALLUSERS</Condition>
83 <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
84 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
85 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
86 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
87 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
88 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
89 </Control>
90 <Control Id="UpdateNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
91 <Condition Action="show">WixUI_InstallMode = "Update" AND NOT ALLUSERS</Condition>
92 <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
93 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
94 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
95 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
96 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
97 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
98 </Control> 74 </Control>
99 75
100 <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)"> 76 <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)" ShowCondition="NOT Installed" />
101 <Condition Action="show">NOT Installed</Condition> 77 <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)" ShowCondition="NOT Installed" />
102 </Control> 78 <Control Id="ChangeTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)" ShowCondition="WixUI_InstallMode = &quot;Change&quot;" />
103 <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)"> 79 <Control Id="ChangeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeText)" ShowCondition="WixUI_InstallMode = &quot;Change&quot;" />
104 <Condition Action="show">NOT Installed</Condition> 80 <Control Id="RepairTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)" ShowCondition="WixUI_InstallMode = &quot;Repair&quot;" />
105 </Control> 81 <Control Id="RepairText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRepairText)" ShowCondition="WixUI_InstallMode = &quot;Repair&quot;" />
106 <Control Id="ChangeTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)"> 82 <Control Id="RemoveTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)" ShowCondition="WixUI_InstallMode = &quot;Remove&quot;" />
107 <Condition Action="show">WixUI_InstallMode = "Change"</Condition> 83 <Control Id="RemoveText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRemoveText)" ShowCondition="WixUI_InstallMode = &quot;Remove&quot;" />
108 </Control> 84 <Control Id="UpdateTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)" ShowCondition="WixUI_InstallMode = &quot;Update&quot;" />
109 <Control Id="ChangeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeText)"> 85 <Control Id="UpdateText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)" ShowCondition="WixUI_InstallMode = &quot;Update&quot;" />
110 <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
111 </Control>
112 <Control Id="RepairTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)">
113 <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
114 </Control>
115 <Control Id="RepairText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRepairText)">
116 <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
117 </Control>
118 <Control Id="RemoveTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)">
119 <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
120 </Control>
121 <Control Id="RemoveText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRemoveText)">
122 <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
123 </Control>
124 <Control Id="UpdateTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)">
125 <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
126 </Control>
127 <Control Id="UpdateText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)">
128 <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
129 </Control>
130 86
131 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 87 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
132 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 88 <Publish Event="SpawnDialog" Value="CancelDlg" />
133 </Control>
134 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
135 <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
136 </Control> 89 </Control>
90 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" DefaultCondition="WixUI_InstallMode = &quot;Remove&quot;" />
137 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" /> 91 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
138 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> 92 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
139 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 93 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
diff --git a/src/wixlib/WaitForCostingDlg.wxs b/src/wixlib/WaitForCostingDlg.wxs
index f6ba67bd..f7d5265c 100644
--- a/src/wixlib/WaitForCostingDlg.wxs
+++ b/src/wixlib/WaitForCostingDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,7 +6,7 @@
7 <UI> 6 <UI>
8 <Dialog Id="WaitForCostingDlg" Width="260" Height="85" Title="!(loc.WaitForCostingDlg_Title)"> 7 <Dialog Id="WaitForCostingDlg" Width="260" Height="85" Title="!(loc.WaitForCostingDlg_Title)">
9 <Control Id="Return" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WaitForCostingDlgReturn)"> 8 <Control Id="Return" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WaitForCostingDlgReturn)">
10 <Publish Event="EndDialog" Value="Exit">1</Publish> 9 <Publish Event="EndDialog" Value="Exit" />
11 </Control> 10 </Control>
12 <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" Text="!(loc.WaitForCostingDlgText)" /> 11 <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" Text="!(loc.WaitForCostingDlgText)" />
13 <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.WaitForCostingDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.WaitForCostingDlgIcon)" /> 12 <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.WaitForCostingDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.WaitForCostingDlgIcon)" />
diff --git a/src/wixlib/WelcomeDlg.wxs b/src/wixlib/WelcomeDlg.wxs
index dcfd24bd..bb13f1dc 100644
--- a/src/wixlib/WelcomeDlg.wxs
+++ b/src/wixlib/WelcomeDlg.wxs
@@ -1,33 +1,26 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment> 5 <Fragment>
7 <UI> 6 <UI>
8 <Dialog Id="WelcomeDlg" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)"> 7 <Dialog Id="WelcomeDlg" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
9 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" > 8 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
10 <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish> 9 <Publish Property="WixUI_InstallMode" Value="Update" Condition="Installed AND PATCH" />
11 </Control> 10 </Control>
12 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 11 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
13 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 12 <Publish Event="SpawnDialog" Value="CancelDlg" />
14 </Control> 13 </Control>
15 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" /> 14 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
16 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> 15 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
17 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 16 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
18 <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" > 17 <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" ShowCondition="NOT Installed OR NOT PATCH" HideCondition="Installed AND PATCH" />
19 <Condition Action="show">NOT Installed OR NOT PATCH</Condition> 18 <Control Id="PatchDescription" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeUpdateDlgDescriptionUpdate)" ShowCondition="Installed AND PATCH" HideCondition="NOT Installed OR NOT PATCH" />
20 <Condition Action="hide">Installed AND PATCH</Condition>
21 </Control>
22 <Control Id="PatchDescription" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeUpdateDlgDescriptionUpdate)" >
23 <Condition Action="show">Installed AND PATCH</Condition>
24 <Condition Action="hide">NOT Installed OR NOT PATCH</Condition>
25 </Control>
26 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" /> 19 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
27 </Dialog> 20 </Dialog>
28 21
29 <InstallUISequence> 22 <InstallUISequence>
30 <Show Dialog="WelcomeDlg" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show> 23 <Show Dialog="WelcomeDlg" Before="ProgressDlg" Overridable="yes" Condition="NOT Installed OR PATCH" />
31 </InstallUISequence> 24 </InstallUISequence>
32 </UI> 25 </UI>
33 </Fragment> 26 </Fragment>
diff --git a/src/wixlib/WelcomeEulaDlg.wxs b/src/wixlib/WelcomeEulaDlg.wxs
index 3283d8cc..38868bcd 100644
--- a/src/wixlib/WelcomeEulaDlg.wxs
+++ b/src/wixlib/WelcomeEulaDlg.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -11,33 +10,27 @@
11 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> 10 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
12 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" /> 11 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
13 <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)"> 12 <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
14 <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish> 13 <Publish Event="DoAction" Value="WixUIPrintEula" />
15 </Control> 14 </Control>
16 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> 15 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
17 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes"> 16 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" ShowCondition="ALLUSERS">
18 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 17 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
19 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 18 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
20 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 19 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
21 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 20 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
22 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 21 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
23 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 22 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
24 <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
25 <Condition Action="enable">LicenseAccepted = "1"</Condition>
26 <Condition Action="show">ALLUSERS</Condition>
27 </Control> 23 </Control>
28 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes"> 24 <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" ShowCondition="NOT ALLUSERS">
29 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> 25 <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
30 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> 26 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
31 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> 27 <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
32 <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 28 <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
33 <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> 29 <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
34 <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> 30 <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
35 <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
36 <Condition Action="enable">LicenseAccepted = "1"</Condition>
37 <Condition Action="show">NOT ALLUSERS</Condition>
38 </Control> 31 </Control>
39 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> 32 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
40 <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> 33 <Publish Event="SpawnDialog" Value="CancelDlg" />
41 </Control> 34 </Control>
42 <Control Id="LicenseText" Type="ScrollableText" X="130" Y="36" Width="226" Height="162" Sunken="yes" TabSkip="no"> 35 <Control Id="LicenseText" Type="ScrollableText" X="130" Y="36" Width="226" Height="162" Sunken="yes" TabSkip="no">
43 <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" /> 36 <Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" />
@@ -46,7 +39,7 @@
46 </UI> 39 </UI>
47 40
48 <InstallUISequence> 41 <InstallUISequence>
49 <Show Dialog="WelcomeEulaDlg" Before="ProgressDlg" Overridable="yes">NOT Installed</Show> 42 <Show Dialog="WelcomeEulaDlg" Before="ProgressDlg" Overridable="yes" Condition="NOT Installed" />
50 </InstallUISequence> 43 </InstallUISequence>
51 </Fragment> 44 </Fragment>
52</Wix> 45</Wix>
diff --git a/src/wixlib/WixUI_Advanced.wxs b/src/wixlib/WixUI_Advanced.wxs
index c86c8cf0..7d1f4df0 100644
--- a/src/wixlib/WixUI_Advanced.wxs
+++ b/src/wixlib/WixUI_Advanced.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5 4
@@ -37,14 +36,14 @@ Todo:
37 <InstallExecuteSequence> 36 <InstallExecuteSequence>
38 <Custom Action="WixSetDefaultPerUserFolder" Before="CostFinalize" /> 37 <Custom Action="WixSetDefaultPerUserFolder" Before="CostFinalize" />
39 <Custom Action="WixSetDefaultPerMachineFolder" After="WixSetDefaultPerUserFolder" /> 38 <Custom Action="WixSetDefaultPerMachineFolder" After="WixSetDefaultPerUserFolder" />
40 <Custom Action="WixSetPerUserFolder" After="WixSetDefaultPerMachineFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom> 39 <Custom Action="WixSetPerUserFolder" After="WixSetDefaultPerMachineFolder" Condition="ACTION=&quot;INSTALL&quot; AND APPLICATIONFOLDER=&quot;&quot; AND (ALLUSERS=&quot;&quot; OR (ALLUSERS=2 AND (NOT Privileged)))" />
41 <Custom Action="WixSetPerMachineFolder" After="WixSetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom> 40 <Custom Action="WixSetPerMachineFolder" After="WixSetPerUserFolder" Condition="ACTION=&quot;INSTALL&quot; AND APPLICATIONFOLDER=&quot;&quot; AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))" />
42 </InstallExecuteSequence> 41 </InstallExecuteSequence>
43 <InstallUISequence> 42 <InstallUISequence>
44 <Custom Action="WixSetDefaultPerUserFolder" Before="CostFinalize" /> 43 <Custom Action="WixSetDefaultPerUserFolder" Before="CostFinalize" />
45 <Custom Action="WixSetDefaultPerMachineFolder" After="WixSetDefaultPerUserFolder" /> 44 <Custom Action="WixSetDefaultPerMachineFolder" After="WixSetDefaultPerUserFolder" />
46 <Custom Action="WixSetPerUserFolder" After="WixSetDefaultPerMachineFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom> 45 <Custom Action="WixSetPerUserFolder" After="WixSetDefaultPerMachineFolder" Condition="ACTION=&quot;INSTALL&quot; AND APPLICATIONFOLDER=&quot;&quot; AND (ALLUSERS=&quot;&quot; OR (ALLUSERS=2 AND (NOT Privileged)))" />
47 <Custom Action="WixSetPerMachineFolder" After="WixSetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom> 46 <Custom Action="WixSetPerMachineFolder" After="WixSetPerUserFolder" Condition="ACTION=&quot;INSTALL&quot; AND APPLICATIONFOLDER=&quot;&quot; AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))" />
48 </InstallUISequence> 47 </InstallUISequence>
49 48
50 <UI Id="WixUI_Advanced"> 49 <UI Id="WixUI_Advanced">
@@ -66,55 +65,54 @@ Todo:
66 <DialogRef Id="ProgressDlg" /> 65 <DialogRef Id="ProgressDlg" />
67 <DialogRef Id="ResumeDlg" /> 66 <DialogRef Id="ResumeDlg" />
68 <DialogRef Id="UserExit" /> 67 <DialogRef Id="UserExit" />
69 <DialogRef Id="WelcomeDlg"/> 68 <DialogRef Id="WelcomeDlg" />
70 69
71 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> 70 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
72 71 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="1" />
73 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="1">1</Publish> 72 <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="2" Condition="WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
74 <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="2"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
75 73
76 <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Advanced" Event="NewDialog" Value="InstallScopeDlg" Order="1">!(wix.WixUISupportPerMachine) AND !(wix.WixUISupportPerUser)</Publish> 74 <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Advanced" Event="NewDialog" Value="InstallScopeDlg" Order="1" Condition="!(wix.WixUISupportPerMachine) AND !(wix.WixUISupportPerUser)" />
77 <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Advanced" Event="NewDialog" Value="FeaturesDlg" Order="2">NOT !(wix.WixUISupportPerMachine)</Publish> 75 <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Advanced" Event="NewDialog" Value="FeaturesDlg" Order="2" Condition="NOT !(wix.WixUISupportPerMachine)" />
78 <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Advanced" Event="NewDialog" Value="InstallDirDlg" Order="3">!(wix.WixUISupportPerMachine) AND NOT !(wix.WixUISupportPerUser)</Publish> 76 <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Advanced" Event="NewDialog" Value="InstallDirDlg" Order="3" Condition="!(wix.WixUISupportPerMachine) AND NOT !(wix.WixUISupportPerUser)" />
79 77
80 <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="AdvancedWelcomeEulaDlg">1</Publish> 78 <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="AdvancedWelcomeEulaDlg" />
81 <!-- override default WixAppFolder of WixPerMachineFolder as standard user won't be shown the radio group to set WixAppFolder --> 79 <!-- override default WixAppFolder of WixPerMachineFolder as standard user won't be shown the radio group to set WixAppFolder -->
82 <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerUserFolder" Order="1">!(wix.WixUISupportPerUser) AND NOT Privileged</Publish> 80 <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerUserFolder" Order="1" Condition="!(wix.WixUISupportPerUser) AND NOT Privileged" />
83 <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="{}" Order="2">WixAppFolder = "WixPerUserFolder"</Publish> 81 <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="{}" Order="2" Condition="WixAppFolder = &quot;WixPerUserFolder&quot;" />
84 <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="3">WixAppFolder = "WixPerMachineFolder"</Publish> 82 <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="3" Condition="WixAppFolder = &quot;WixPerMachineFolder&quot;" />
85 <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerUserFolder]" Order="4">WixAppFolder = "WixPerUserFolder"</Publish> 83 <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerUserFolder]" Order="4" Condition="WixAppFolder = &quot;WixPerUserFolder&quot;" />
86 <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerMachineFolder]" Order="5">WixAppFolder = "WixPerMachineFolder"</Publish> 84 <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerMachineFolder]" Order="5" Condition="WixAppFolder = &quot;WixPerMachineFolder&quot;" />
87 <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="6">WixAppFolder = "WixPerUserFolder"</Publish> 85 <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="6" Condition="WixAppFolder = &quot;WixPerUserFolder&quot;" />
88 <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="7">WixAppFolder = "WixPerMachineFolder"</Publish> 86 <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="7" Condition="WixAppFolder = &quot;WixPerMachineFolder&quot;" />
89 87
90 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">!(wix.WixUISupportPerUser)</Publish> 88 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg" Condition="!(wix.WixUISupportPerUser)" />
91 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="AdvancedWelcomeEulaDlg">NOT !(wix.WixUISupportPerUser)</Publish> 89 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="AdvancedWelcomeEulaDlg" Condition="NOT !(wix.WixUISupportPerUser)" />
92 <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> 90 <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" />
93 <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish> 91 <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
94 <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> 92 <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
95 <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish> 93 <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=&quot;1&quot;" />
96 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> 94 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" />
97 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish> 95 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" />
98 96
99 <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">NOT Installed AND WixAppFolder = "WixPerUserFolder"</Publish> 97 <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg" Condition="NOT Installed AND WixAppFolder = &quot;WixPerUserFolder&quot;" />
100 <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">NOT Installed AND WixAppFolder = "WixPerMachineFolder"</Publish> 98 <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Condition="NOT Installed AND WixAppFolder = &quot;WixPerMachineFolder&quot;" />
101 <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">Installed</Publish> 99 <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Condition="Installed" />
102 100
103 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> 101 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
104 102
105 <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="FeaturesDlg">1</Publish> 103 <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="FeaturesDlg" />
106 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 104 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
107 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 105 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
108 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> 106 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
109 107
110 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> 108 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
111 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish> 109 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3" Condition="Installed AND PATCH" />
112 110
113 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> 111 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
114 </UI> 112 </UI>
115 113
116 <InstallUISequence> 114 <InstallUISequence>
117 <Show Dialog="WelcomeDlg" Before="AdvancedWelcomeEulaDlg" >Installed AND PATCH</Show> 115 <Show Dialog="WelcomeDlg" Before="AdvancedWelcomeEulaDlg" Condition="Installed AND PATCH" />
118 </InstallUISequence> 116 </InstallUISequence>
119 117
120 <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> 118 <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
diff --git a/src/wixlib/WixUI_FeatureTree.wxs b/src/wixlib/WixUI_FeatureTree.wxs
index fdb8584b..e999f2fe 100644
--- a/src/wixlib/WixUI_FeatureTree.wxs
+++ b/src/wixlib/WixUI_FeatureTree.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5 4
@@ -41,28 +40,28 @@ Patch dialog sequence:
41 <DialogRef Id="ResumeDlg" /> 40 <DialogRef Id="ResumeDlg" />
42 <DialogRef Id="UserExit" /> 41 <DialogRef Id="UserExit" />
43 42
44 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> 43 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
45 44
46 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish> 45 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg" Condition="NOT Installed" />
47 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> 46 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
48 47
49 <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> 48 <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
50 <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg">LicenseAccepted = "1"</Publish> 49 <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg" Condition="LicenseAccepted = &quot;1&quot;" />
51 50
52 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish> 51 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1" Condition="Installed" />
53 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed</Publish> 52 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2" Condition="NOT Installed" />
54 <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 53 <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
55 54
56 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish> 55 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="NOT Installed OR WixUI_InstallMode = &quot;Change&quot;" />
57 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> 56 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
58 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish> 57 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3" Condition="Installed AND PATCH" />
59 58
60 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> 59 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
61 60
62 <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> 61 <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg" />
63 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 62 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
64 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 63 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
65 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> 64 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
66 </UI> 65 </UI>
67 66
68 <UIRef Id="WixUI_Common" /> 67 <UIRef Id="WixUI_Common" />
diff --git a/src/wixlib/WixUI_InstallDir.wxs b/src/wixlib/WixUI_InstallDir.wxs
index dae09a48..afe7820f 100644
--- a/src/wixlib/WixUI_InstallDir.wxs
+++ b/src/wixlib/WixUI_InstallDir.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5 4
@@ -43,35 +42,33 @@ Patch dialog sequence:
43 <DialogRef Id="ProgressDlg" /> 42 <DialogRef Id="ProgressDlg" />
44 <DialogRef Id="ResumeDlg" /> 43 <DialogRef Id="ResumeDlg" />
45 <DialogRef Id="UserExit" /> 44 <DialogRef Id="UserExit" />
46 45 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3" />
47 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish> 46 <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
48 <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> 47
49 48 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
50 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> 49
51 50 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg" Condition="NOT Installed" />
52 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish> 51 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
53 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> 52
54 53 <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
55 <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> 54 <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Condition="LicenseAccepted = &quot;1&quot;" />
56 <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish> 55
57 56 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" />
58 <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> 57 <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" />
59 <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> 58 <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
60 <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish> 59 <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
61 <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> 60 <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=&quot;1&quot;" />
62 <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish> 61 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" />
63 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> 62 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" />
64 <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish> 63 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" />
65 64 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
66 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish> 65 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />
67 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> 66
68 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish> 67 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
69 68
70 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> 69 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
71 70 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
72 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 71 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
73 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
74 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
75 72
76 <Property Id="ARPNOMODIFY" Value="1" /> 73 <Property Id="ARPNOMODIFY" Value="1" />
77 </UI> 74 </UI>
diff --git a/src/wixlib/WixUI_Minimal.wxs b/src/wixlib/WixUI_Minimal.wxs
index 8c8ef2c8..08dba96d 100644
--- a/src/wixlib/WixUI_Minimal.wxs
+++ b/src/wixlib/WixUI_Minimal.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5 4
@@ -38,22 +37,22 @@ Patch dialog sequence:
38 <DialogRef Id="WelcomeDlg" /> 37 <DialogRef Id="WelcomeDlg" />
39 <DialogRef Id="WelcomeEulaDlg" /> 38 <DialogRef Id="WelcomeEulaDlg" />
40 39
41 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> 40 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
42 41
43 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> 42 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" />
44 43
45 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> 44 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
46 45
47 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 46 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
48 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 47 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
49 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> 48 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
50 49
51 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> 50 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
52 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish> 51 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />
53 52
54 <InstallUISequence> 53 <InstallUISequence>
55 <Show Dialog="WelcomeDlg" Before="WelcomeEulaDlg">Installed AND PATCH</Show> 54 <Show Dialog="WelcomeDlg" Before="WelcomeEulaDlg" Condition="Installed AND PATCH" />
56 <Show Dialog="WelcomeEulaDlg" Before="ProgressDlg">NOT Installed</Show> 55 <Show Dialog="WelcomeEulaDlg" Before="ProgressDlg" Condition="NOT Installed" />
57 </InstallUISequence> 56 </InstallUISequence>
58 57
59 <Property Id="ARPNOMODIFY" Value="1" /> 58 <Property Id="ARPNOMODIFY" Value="1" />
diff --git a/src/wixlib/WixUI_Mondo.wxs b/src/wixlib/WixUI_Mondo.wxs
index b9f17720..2d53b9dd 100644
--- a/src/wixlib/WixUI_Mondo.wxs
+++ b/src/wixlib/WixUI_Mondo.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5 4
@@ -43,35 +42,35 @@ Patch dialog sequence:
43 <DialogRef Id="ResumeDlg" /> 42 <DialogRef Id="ResumeDlg" />
44 <DialogRef Id="UserExit" /> 43 <DialogRef Id="UserExit" />
45 44
46 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> 45 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
47 46
48 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed AND NOT PATCH</Publish> 47 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg" Condition="NOT Installed AND NOT PATCH" />
49 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> 48 <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
50 49
51 <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> 50 <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
52 <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish> 51 <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="LicenseAccepted = &quot;1&quot;" />
53 52
54 <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> 53 <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" />
55 <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 54 <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg" />
56 <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> 55 <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg" />
57 <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 56 <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg" />
58 57
59 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish> 58 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1" Condition="WixUI_InstallMode = &quot;Change&quot;" />
60 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish> 59 <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="WixUI_InstallMode = &quot;InstallCustom&quot;" />
61 <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 60 <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
62 61
63 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish> 62 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="WixUI_InstallMode = &quot;InstallCustom&quot;" />
64 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish> 63 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="WixUI_InstallMode = &quot;InstallTypical&quot; OR WixUI_InstallMode = &quot;InstallComplete&quot;" />
65 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish> 64 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3" Condition="WixUI_InstallMode = &quot;Change&quot;" />
66 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish> 65 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4" Condition="WixUI_InstallMode = &quot;Repair&quot; OR WixUI_InstallMode = &quot;Remove&quot;" />
67 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">WixUI_InstallMode = "Update"</Publish> 66 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="WixUI_InstallMode = &quot;Update&quot;" />
68 67
69 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> 68 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
70 69
71 <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> 70 <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg" />
72 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 71 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
73 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> 72 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
74 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> 73 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
75 </UI> 74 </UI>
76 75
77 <UIRef Id="WixUI_Common" /> 76 <UIRef Id="WixUI_Common" />
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
index a56a2393..18436269 100644
--- a/src/wixlib/caSuffix.wxi
+++ b/src/wixlib/caSuffix.wxi
@@ -1,28 +1,27 @@
1<?xml version="1.0" encoding="utf-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?ifndef platform ?> 4 <?ifndef platform ?>
6 <?error Required value "platform" not defined in include caSuffix.wxi ?> 5 <?error Required value "platform" not defined in include caSuffix.wxi ?>
7 <?endif ?> 6 <?endif?>
8 7
9 <?ifdef Suffix ?> 8 <?ifdef Suffix ?>
10 <?undef Suffix ?> 9 <?undef Suffix ?>
11 <?undef DeferredSuffix ?> 10 <?undef DeferredSuffix ?>
12 <?endif ?> 11 <?endif?>
13 12
14 <?if $(var.platform)="x86" ?> 13 <?if $(var.platform)="x86" ?>
15 <?define Suffix="" ?> 14 <?define Suffix="" ?>
16 <?define DeferredSuffix="" ?> 15 <?define DeferredSuffix="" ?>
17 <?endif ?> 16 <?endif?>
18 17
19 <?if $(var.platform)="x64" ?> 18 <?if $(var.platform)="x64" ?>
20 <?define Suffix="_x64" ?> 19 <?define Suffix="_x64" ?>
21 <?define DeferredSuffix="_64" ?> 20 <?define DeferredSuffix="_64" ?>
22 <?endif ?> 21 <?endif?>
23 22
24 <?if $(var.platform)="arm" ?> 23 <?if $(var.platform)="arm" ?>
25 <?define Suffix="_ARM" ?> 24 <?define Suffix="_ARM" ?>
26 <?define DeferredSuffix="_ARM" ?> 25 <?define DeferredSuffix="_ARM" ?>
27 <?endif ?> 26 <?endif?>
28</Include> 27</Include>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 06:08:46 +0000