diff options
| author | Bob Arnson <bob@firegiant.com> | 2024-09-27 22:09:24 -0400 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-12-26 21:46:38 -0800 |
| commit | aa2678906191e0535fad5634467f074aae049c09 (patch) | |
| tree | d4b4d03a313d12dac0f4ee7f81b1945b1293691e /src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense | |
| parent | 3986a0b375d5b536f897d6284770baf711afaf86 (diff) | |
| download | wix-aa2678906191e0535fad5634467f074aae049c09.tar.gz wix-aa2678906191e0535fad5634467f074aae049c09.tar.bz2 wix-aa2678906191e0535fad5634467f074aae049c09.zip | |
Drop CA path validation in WixUI by default.
Add `WixUI/ExtendedPathValidation="yes"` to opt-in.
Removed the WIXUI_DONTVALIDATEPATH runtime opt-out.
Fixes https://github.com/wixtoolset/issues/issues/8718
Relies on https://github.com/wixtoolset/wix/pull/563
Diffstat (limited to 'src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense')
| -rw-r--r-- | src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense/Package.wxs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense/Package.wxs b/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense/Package.wxs index 86b7453e..0c9fd195 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense/Package.wxs +++ b/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_NoLicense/Package.wxs | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | <?foreach WIXUIARCH in X86;X64;A64 ?> | 24 | <?foreach WIXUIARCH in X86;X64;A64 ?> |
| 25 | <Fragment> | 25 | <Fragment> |
| 26 | <UI Id="InstallDir_NoLicense_$(WIXUIARCH)"> | 26 | <UI Id="InstallDir_NoLicense_$(WIXUIARCH)"> |
| 27 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 27 | <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" /> |
| 28 | <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" /> | 28 | <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" /> |
| 29 | </UI> | 29 | </UI> |
| 30 | 30 | ||
| 31 | <UIRef Id="InstallDir_NoLicense" /> | 31 | <UIRef Id="InstallDir_NoLicense" /> |
| @@ -50,8 +50,6 @@ | |||
| 50 | <DialogRef Id="ProgressDlg" /> | 50 | <DialogRef Id="ProgressDlg" /> |
| 51 | <DialogRef Id="ResumeDlg" /> | 51 | <DialogRef Id="ResumeDlg" /> |
| 52 | <DialogRef Id="UserExit" /> | 52 | <DialogRef Id="UserExit" /> |
| 53 | |||
| 54 | <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"" /> | ||
| 55 | 53 | ||
| 56 | <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" /> | 54 | <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" /> |
| 57 | 55 | ||
| @@ -59,11 +57,14 @@ | |||
| 59 | <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" /> | 57 | <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" /> |
| 60 | 58 | ||
| 61 | <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" /> | 59 | <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" /> |
| 62 | <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" /> | 60 | <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="3" /> |
| 63 | <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"" /> | 61 | <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" /> |
| 64 | <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"" /> | ||
| 65 | <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" /> | 62 | <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" /> |
| 66 | <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" /> | 63 | <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" /> |
| 64 | |||
| 65 | <Publish Dialog="BrowseDlg" Control="OK" Event="SetTargetPath" Value="[_BrowseProperty]" Order="3" /> | ||
| 66 | <Publish Dialog="BrowseDlg" Control="OK" Event="EndDialog" Value="Return" Order="4" /> | ||
| 67 | |||
| 67 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" /> | 68 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" /> |
| 68 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" /> | 69 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" /> |
| 69 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" /> | 70 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" /> |
