diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-23 00:56:36 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-23 02:10:31 -0700 |
| commit | ed0fb39537c0cfb13922537a26f9d895180d42d8 (patch) | |
| tree | 7bc1015a1a548c6b1d38b7f9608afe34ffbf6ea0 /src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence | |
| parent | 9319732abb1eee646b3540b8511b328833a1acfb (diff) | |
| download | wix-ed0fb39537c0cfb13922537a26f9d895180d42d8.tar.gz wix-ed0fb39537c0cfb13922537a26f9d895180d42d8.tar.bz2 wix-ed0fb39537c0cfb13922537a26f9d895180d42d8.zip | |
Remove obsolete inner text handling
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs index 1101d901..c6deb864 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs | |||
| @@ -4,16 +4,13 @@ | |||
| 4 | <UI Id="CustomDialog"> | 4 | <UI Id="CustomDialog"> |
| 5 | <Dialog Id="FirstDialog" Width="100" Height="100"> | 5 | <Dialog Id="FirstDialog" Width="100" Height="100"> |
| 6 | <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="FirstDialogTitle" /> | 6 | <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="FirstDialogTitle" /> |
| 7 | <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader"> | 7 | <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader" |
| 8 | <Condition Action="hide">Installed</Condition> | 8 | HideCondition="Installed" DisableCondition="Installed" /> |
| 9 | <Condition Action="disable">Installed</Condition> | ||
| 10 | </Control> | ||
| 11 | </Dialog> | 9 | </Dialog> |
| 12 | <Dialog Id="SecondDialog" Width="100" Height="100"> | 10 | <Dialog Id="SecondDialog" Width="100" Height="100"> |
| 13 | <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" /> | 11 | <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" /> |
| 14 | <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]"> | 12 | <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]" |
| 15 | <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition> | 13 | ShowCondition="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed" /> |
| 16 | </Control> | ||
| 17 | </Dialog> | 14 | </Dialog> |
| 18 | 15 | ||
| 19 | <InstallUISequence> | 16 | <InstallUISequence> |
| @@ -29,8 +26,8 @@ | |||
| 29 | <Publish Dialog="FirstDialog" Control="Next" Event="NewDialog" Value="SecondDialog">Installed AND PATCH</Publish> | 26 | <Publish Dialog="FirstDialog" Control="Next" Event="NewDialog" Value="SecondDialog">Installed AND PATCH</Publish> |
| 30 | 27 | ||
| 31 | <InstallUISequence> | 28 | <InstallUISequence> |
| 32 | <Show Dialog="FirstDialog" Before="SecondDialog">Installed AND PATCH</Show> | 29 | <Show Dialog="FirstDialog" Before="SecondDialog" Condition="Installed AND PATCH" /> |
| 33 | <Show Dialog="SecondDialog" Before="ExecuteAction">NOT Installed</Show> | 30 | <Show Dialog="SecondDialog" Before="ExecuteAction" Condition="NOT Installed" /> |
| 34 | </InstallUISequence> | 31 | </InstallUISequence> |
| 35 | </UI> | 32 | </UI> |
| 36 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 33 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |