diff options
author | Bob Arnson <bob@firegiant.com> | 2023-04-26 13:33:59 -0400 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-06-03 01:24:39 -0700 |
commit | 29146461effb7798e054aa9933a88f612237df47 (patch) | |
tree | ee1db7b3040842241bc61255b9f8abff0523e725 | |
parent | 846165622978edbea0f5cf58c32f35bc6bfe2906 (diff) | |
download | wix-29146461effb7798e054aa9933a88f612237df47.tar.gz wix-29146461effb7798e054aa9933a88f612237df47.tar.bz2 wix-29146461effb7798e054aa9933a88f612237df47.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.cs | 1 | ||||
-rw-r--r-- | src/ext/UI/wixlib/WixUI_Mondo.wxs | 1 |
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" /> |