More virtual/override symbols.
And *Sequence/Show works thusly, even with somewhat funky ids.
Bob Arnson committed
Mar 3, 2024 at 14:16 UTC
7ec45e8318dc81392daa4eb3d8f95a1a88b60402
12 files changed
+19
-19
src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+2
-2
@@ -405,8 +405,8 @@ namespace WixToolsetTest.UI
405
406
private static void Build(string[] args)
407
{
408
- var result = WixRunner.Execute(args)
409
- .AssertSuccess();
408
+ var result = WixRunner.Execute(args);
409
+ result.AssertSuccess();
410
}
411
412
private static void BuildX64(string[] args)
src/ext/UI/wixlib/Common.wxs
+1
-1
@@ -9,7 +9,7 @@
9
<Binary Id="WixUI_Ico_Info" SourceFile="!(wix.WixUIInfoIco=$(var.infoIco))" />
10
<Binary Id="WixUI_Bmp_New" SourceFile="!(wix.WixUINewIco=$(var.newIco))" />
11
<Binary Id="WixUI_Bmp_Up" SourceFile="!(wix.WixUIUpIco=$(var.upIco))" />
12
- <WixVariable Id="WixUICostingPopupOptOut" Value="1" Overridable="yes" />
12
+ <WixVariable Id="virtual WixUICostingPopupOptOut" Value="1" />
13
14
<UI Id="WixUI_Common">
15
<!-- ui text -->
src/ext/UI/wixlib/ExitDialog.wxs
+2
-2
@@ -17,11 +17,11 @@
17
</Dialog>
18
19
<InstallUISequence>
20
- <Show Dialog="ExitDialog" OnExit="success" Overridable="yes" />
20
+ <Show Dialog="virtual ExitDialog" OnExit="success" />
21
</InstallUISequence>
22
23
<AdminUISequence>
24
- <Show Dialog="ExitDialog" OnExit="success" Overridable="yes" />
24
+ <Show Dialog="virtual ExitDialog" OnExit="success" />
25
</AdminUISequence>
26
</UI>
27
</Fragment>
src/ext/UI/wixlib/FatalError.wxs
+2
-2
@@ -17,11 +17,11 @@
17
</Dialog>
18
19
<InstallUISequence>
20
- <Show Dialog="FatalError" OnExit="error" Overridable="yes" />
20
+ <Show Dialog="virtual FatalError" OnExit="error" />
21
</InstallUISequence>
22
23
<AdminUISequence>
24
- <Show Dialog="FatalError" OnExit="error" Overridable="yes" />
24
+ <Show Dialog="virtual FatalError" OnExit="error" />
25
</AdminUISequence>
26
</UI>
27
</Fragment>
src/ext/UI/wixlib/MaintenanceWelcomeDlg.wxs
+1
-1
@@ -19,7 +19,7 @@
19
</Dialog>
20
21
<InstallUISequence>
22
- <Show Dialog="MaintenanceWelcomeDlg" Before="ProgressDlg" Overridable="yes" Condition="Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH" />
22
+ <Show Dialog="virtual MaintenanceWelcomeDlg" Before="ProgressDlg" Condition="Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH" />
23
</InstallUISequence>
24
</UI>
25
</Fragment>
src/ext/UI/wixlib/PrepareDlg.wxs
+1
-1
@@ -23,7 +23,7 @@
23
</Dialog>
24
25
<InstallUISequence>
26
- <Show Dialog="PrepareDlg" Before="AppSearch" Overridable="yes" />
26
+ <Show Dialog="virtual PrepareDlg" Before="AppSearch" />
27
</InstallUISequence>
28
</UI>
29
</Fragment>
src/ext/UI/wixlib/ProgressDlg.wxs
+1
-1
@@ -34,7 +34,7 @@
34
</Dialog>
35
36
<InstallUISequence>
37
- <Show Dialog="ProgressDlg" Before="ExecuteAction" Overridable="yes" />
37
+ <Show Dialog="virtual ProgressDlg" Before="ExecuteAction" />
38
</InstallUISequence>
39
</UI>
40
</Fragment>
src/ext/UI/wixlib/ResumeDlg.wxs
+1
-1
@@ -32,7 +32,7 @@
32
</Dialog>
33
34
<InstallUISequence>
35
- <Show Dialog="ResumeDlg" Before="ProgressDlg" Overridable="yes" Condition="Installed AND (RESUME OR Preselected)" />
35
+ <Show Dialog="virtual ResumeDlg" Before="ProgressDlg" Condition="Installed AND (RESUME OR Preselected)" />
36
</InstallUISequence>
37
</UI>
38
</Fragment>
src/ext/UI/wixlib/UserExit.wxs
+2
-2
@@ -17,11 +17,11 @@
17
</Dialog>
18
19
<InstallUISequence>
20
- <Show Dialog="UserExit" OnExit="cancel" Overridable="yes" />
20
+ <Show Dialog="virtual UserExit" OnExit="cancel" />
21
</InstallUISequence>
22
23
<AdminUISequence>
24
- <Show Dialog="UserExit" OnExit="cancel" Overridable="yes" />
24
+ <Show Dialog="virtual UserExit" OnExit="cancel" />
25
</AdminUISequence>
26
</UI>
27
</Fragment>
src/ext/UI/wixlib/WelcomeDlg.wxs
+1
-1
@@ -20,7 +20,7 @@
20
</Dialog>
21
22
<InstallUISequence>
23
- <Show Dialog="WelcomeDlg" Before="ProgressDlg" Overridable="yes" Condition="NOT Installed OR PATCH" />
23
+ <Show Dialog="virtual WelcomeDlg" Before="ProgressDlg" Condition="NOT Installed OR PATCH" />
24
</InstallUISequence>
25
</UI>
26
</Fragment>
src/ext/UI/wixlib/WelcomeEulaDlg.wxs
+1
-1
@@ -37,7 +37,7 @@
37
</UI>
38
39
<InstallUISequence>
40
- <Show Dialog="WelcomeEulaDlg" Before="ProgressDlg" Overridable="yes" Condition="NOT Installed" />
40
+ <Show Dialog="virtual WelcomeEulaDlg" Before="ProgressDlg" Condition="NOT Installed" />
41
</InstallUISequence>
42
</Fragment>
43
</Wix>
src/ext/UI/wixlib/WixUI_Advanced.wxs
+4
-4
@@ -8,7 +8,7 @@ installs, install path, and features.
8
WiX variables used:
9
- WixUISupportPerMachine
10
- WixUISupportPerUser
11
-
11
+
12
Todo:
13
- Clicking Install doesn't work! - APPLICATIONFOLDER isn't set; need to accept another "incoming" property.
14
- Replace this dialog set UI fragment with the UI extension.
@@ -33,8 +33,8 @@ Todo:
33
<?endforeach?>
34
35
<Fragment>
36
- <WixVariable Id="WixUISupportPerUser" Value="1" Overridable="yes" />
37
- <WixVariable Id="WixUISupportPerMachine" Value="1" Overridable="yes" />
36
+ <WixVariable Id="virtual WixUISupportPerUser" Value="1" />
37
+ <WixVariable Id="virtual WixUISupportPerMachine" Value="1" />
38
39
<PropertyRef Id="ApplicationFolderName" />
40
@@ -119,7 +119,7 @@ Todo:
119
</UI>
120
121
<InstallUISequence>
122
- <Show Dialog="WelcomeDlg" Before="AdvancedWelcomeEulaDlg" Condition="Installed AND PATCH" />
122
+ <Show Dialog="override WelcomeDlg" Before="AdvancedWelcomeEulaDlg" Condition="Installed AND PATCH" />
123
</InstallUISequence>
124
125
<Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />