diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-30 18:56:06 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-30 19:09:37 -0400 |
| commit | 7a7f88c3009ad824852322682cc8cfd3173c2e02 (patch) | |
| tree | 98c980444bb1a51297e4eae01171565b02d4ce75 /src/test | |
| parent | 27124207afa517da564cdce557dd21654f1a9078 (diff) | |
| download | wix-7a7f88c3009ad824852322682cc8cfd3173c2e02.tar.gz wix-7a7f88c3009ad824852322682cc8cfd3173c2e02.tar.bz2 wix-7a7f88c3009ad824852322682cc8cfd3173c2e02.zip | |
Add error message for cases where inner text used to be used.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs index 10c8b2c3..ec6e62df 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs | |||
| @@ -1,21 +1,17 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | 2 | <Fragment> |
| 4 | <UI Id="CustomDialog"> | 3 | <UI Id="CustomDialog"> |
| 5 | <Dialog Id="FirstDialog" Width="100" Height="100"> | 4 | <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" /> | 5 | <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" | 6 | <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader" HideCondition="Installed" DisableCondition="Installed" /> |
| 8 | HideCondition="Installed" DisableCondition="Installed" /> | ||
| 9 | </Dialog> | 7 | </Dialog> |
| 10 | <Dialog Id="SecondDialog" Width="100" Height="100"> | 8 | <Dialog Id="SecondDialog" Width="100" Height="100"> |
| 11 | <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" /> | 9 | <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" /> |
| 12 | <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]" | 10 | <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]" ToolTip="Optional checkbox" Help="Check this box for fun" ShowCondition="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed" /> |
| 13 | ToolTip="Optional checkbox" Help="Check this box for fun" | ||
| 14 | ShowCondition="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed" /> | ||
| 15 | </Dialog> | 11 | </Dialog> |
| 16 | 12 | ||
| 17 | <InstallUISequence> | 13 | <InstallUISequence> |
| 18 | <Show Dialog="SecondDialog" Before="FirstDialog" Overridable="yes">NOT Installed</Show> | 14 | <Show Dialog="SecondDialog" Before="FirstDialog" Overridable="yes" Condition="NOT Installed" /> |
| 19 | </InstallUISequence> | 15 | </InstallUISequence> |
| 20 | </UI> | 16 | </UI> |
| 21 | </Fragment> | 17 | </Fragment> |
| @@ -24,7 +20,7 @@ | |||
| 24 | <DialogRef Id="FirstDialog" /> | 20 | <DialogRef Id="FirstDialog" /> |
| 25 | <DialogRef Id="SecondDialog" /> | 21 | <DialogRef Id="SecondDialog" /> |
| 26 | 22 | ||
| 27 | <Publish Dialog="FirstDialog" Control="Next" Event="NewDialog" Value="SecondDialog">Installed AND PATCH</Publish> | 23 | <Publish Dialog="FirstDialog" Control="Next" Event="NewDialog" Value="SecondDialog" Condition="Installed AND PATCH" /> |
| 28 | 24 | ||
| 29 | <InstallUISequence> | 25 | <InstallUISequence> |
| 30 | <Show Dialog="FirstDialog" Before="SecondDialog" Condition="Installed AND PATCH" /> | 26 | <Show Dialog="FirstDialog" Before="SecondDialog" Condition="Installed AND PATCH" /> |