aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2023-04-26 13:33:59 -0400
committerBob Arnson <github@bobs.org>2023-04-26 14:49:10 -0400
commit3c40f43c76d44787bfc1602cb7d95ea3a0787748 (patch)
treeeb74c83b4fdb7e4e8a138a4411d1324ba09b1462
parenteadea8a97bd69fa553abcebce644d4f770a94c3b (diff)
downloadwix-3c40f43c76d44787bfc1602cb7d95ea3a0787748.tar.gz
wix-3c40f43c76d44787bfc1602cb7d95ea3a0787748.tar.bz2
wix-3c40f43c76d44787bfc1602cb7d95ea3a0787748.zip
Remove InstallDirDlg reference from WixUI_Mondo
Fixes https://github.com/wixtoolset/issues/issues/7436.
-rw-r--r--src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs1
-rw-r--r--src/ext/UI/wixlib/WixUI_Mondo.wxs1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index 17eec347..77b2ca3a 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -284,7 +284,6 @@ namespace WixToolsetTest.UI
284 WixAssert.CompareLineByLine(new[] 284 WixAssert.CompareLineByLine(new[]
285 { 285 {
286 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t3", 286 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t3",
287 "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t2",
288 "ControlEvent:LicenseAgreementDlg\tPrint\tDoAction\tWixUIPrintEula_X86\t1\t1", 287 "ControlEvent:LicenseAgreementDlg\tPrint\tDoAction\tWixUIPrintEula_X86\t1\t1",
289 }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray()); 288 }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray());
290 } 289 }
diff --git a/src/ext/UI/wixlib/WixUI_Mondo.wxs b/src/ext/UI/wixlib/WixUI_Mondo.wxs
index 2f883b8b..aac13112 100644
--- a/src/ext/UI/wixlib/WixUI_Mondo.wxs
+++ b/src/ext/UI/wixlib/WixUI_Mondo.wxs
@@ -27,7 +27,6 @@ Patch dialog sequence:
27 <UI Id="WixUI_Mondo_$(WIXUIARCH)"> 27 <UI Id="WixUI_Mondo_$(WIXUIARCH)">
28 <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> 28 <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
29 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" /> 29 <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" />
30 <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
31 </UI> 30 </UI>
32 31
33 <UIRef Id="WixUI_Mondo" /> 32 <UIRef Id="WixUI_Mondo" />