aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-23 00:56:36 -0700
committerRob Mensching <rob@firegiant.com>2020-06-23 02:10:31 -0700
commited0fb39537c0cfb13922537a26f9d895180d42d8 (patch)
tree7bc1015a1a548c6b1d38b7f9608afe34ffbf6ea0 /src/test
parent9319732abb1eee646b3540b8511b328833a1acfb (diff)
downloadwix-ed0fb39537c0cfb13922537a26f9d895180d42d8.tar.gz
wix-ed0fb39537c0cfb13922537a26f9d895180d42d8.tar.bz2
wix-ed0fb39537c0cfb13922537a26f9d895180d42d8.zip
Remove obsolete inner text handling
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs24
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs2
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs16
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs8
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs15
5 files changed, 31 insertions, 34 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
index 8482a57e..db755171 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
@@ -10,12 +10,12 @@
10 <BundleAttributeDefinition Id="Column2" /> 10 <BundleAttributeDefinition Id="Column2" />
11 11
12 <BundleElement> 12 <BundleElement>
13 <BundleAttribute Id="Id">one</BundleAttribute> 13 <BundleAttribute Id="Id" Value="one" />
14 <BundleAttribute Id="Column2">two</BundleAttribute> 14 <BundleAttribute Id="Column2" Value="two" />
15 </BundleElement> 15 </BundleElement>
16 <BundleElement> 16 <BundleElement>
17 <BundleAttribute Id="Column2">&lt;</BundleAttribute> 17 <BundleAttribute Id="Column2" Value="&lt;" />
18 <BundleAttribute Id="Id">&gt;</BundleAttribute> 18 <BundleAttribute Id="Id" Value="&gt;" />
19 </BundleElement> 19 </BundleElement>
20 </BundleCustomData> 20 </BundleCustomData>
21 21
@@ -28,23 +28,23 @@
28 <Fragment> 28 <Fragment>
29 <BundleCustomDataRef Id="BundleCustomTableBA"> 29 <BundleCustomDataRef Id="BundleCustomTableBA">
30 <BundleElement> 30 <BundleElement>
31 <BundleAttribute Id="Id">1</BundleAttribute> 31 <BundleAttribute Id="Id" Value="1" />
32 <BundleAttribute Id="Column2">2</BundleAttribute> 32 <BundleAttribute Id="Column2" Value="2" />
33 </BundleElement> 33 </BundleElement>
34 </BundleCustomDataRef> 34 </BundleCustomDataRef>
35 35
36 <BundleCustomDataRef Id="BundleCustomTableBE"> 36 <BundleCustomDataRef Id="BundleCustomTableBE">
37 <BundleElement> 37 <BundleElement>
38 <BundleAttribute Id="Id">one</BundleAttribute> 38 <BundleAttribute Id="Id" Value="one" />
39 <BundleAttribute Id="Column2">two</BundleAttribute> 39 <BundleAttribute Id="Column2" Value="two" />
40 </BundleElement> 40 </BundleElement>
41 <BundleElement> 41 <BundleElement>
42 <BundleAttribute Id="Column2">&lt;</BundleAttribute> 42 <BundleAttribute Id="Column2" Value="&lt;" />
43 <BundleAttribute Id="Id">&gt;</BundleAttribute> 43 <BundleAttribute Id="Id" Value="&gt;" />
44 </BundleElement> 44 </BundleElement>
45 <BundleElement> 45 <BundleElement>
46 <BundleAttribute Id="Id">1</BundleAttribute> 46 <BundleAttribute Id="Id" Value="1" />
47 <BundleAttribute Id="Column2">2</BundleAttribute> 47 <BundleAttribute Id="Column2" Value="2" />
48 </BundleElement> 48 </BundleElement>
49 </BundleCustomDataRef> 49 </BundleCustomDataRef>
50 50
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
index 2846d16e..0784824a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
@@ -27,7 +27,7 @@
27 </InstallUISequence> 27 </InstallUISequence>
28 28
29 <UI> 29 <UI>
30 <ProgressText Action="CustomAction2">Progess2Text</ProgressText> 30 <ProgressText Action="CustomAction2" Message="Progess2Text" />
31 </UI> 31 </UI>
32 </Fragment> 32 </Fragment>
33</Wix> 33</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
index 51aee5f2..7f4a43e5 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
@@ -9,12 +9,12 @@
9 <Column Id="Column1" Type="string" PrimaryKey="yes" Category="text" Modularize="column" Description="The first custom column." /> 9 <Column Id="Column1" Type="string" PrimaryKey="yes" Category="text" Modularize="column" Description="The first custom column." />
10 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" /> 10 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" />
11 <Row> 11 <Row>
12 <Data Column="Column1">Row1</Data> 12 <Data Column="Column1" Value="Row1" />
13 <Data Column="Component_">test.txt</Data> 13 <Data Column="Component_" Value="test.txt" />
14 </Row> 14 </Row>
15 <Row> 15 <Row>
16 <Data Column="Column1">Row2</Data> 16 <Data Column="Column1" Value="Row2" />
17 <Data Column="Component_">test.txt</Data> 17 <Data Column="Component_" Value="test.txt" />
18 </Row> 18 </Row>
19 </CustomTable> 19 </CustomTable>
20 20
@@ -22,12 +22,12 @@
22 <Column Id="ColumnA" Type="string" PrimaryKey="yes" /> 22 <Column Id="ColumnA" Type="string" PrimaryKey="yes" />
23 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" /> 23 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" />
24 <Row> 24 <Row>
25 <Data Column="ColumnA">RowA</Data> 25 <Data Column="ColumnA" Value="RowA" />
26 <Data Column="Component_">test.txt</Data> 26 <Data Column="Component_" Value="test.txt" />
27 </Row> 27 </Row>
28 <Row> 28 <Row>
29 <Data Column="ColumnA">RowB</Data> 29 <Data Column="ColumnA" Value="RowB" />
30 <Data Column="Component_">test.txt</Data> 30 <Data Column="Component_" Value="test.txt" />
31 </Row> 31 </Row>
32 </CustomTable> 32 </CustomTable>
33 </Fragment> 33 </Fragment>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
index ad5ed233..08a9c470 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs
@@ -9,12 +9,12 @@
9 <Column Id="Column1" Type="string" PrimaryKey="yes" /> 9 <Column Id="Column1" Type="string" PrimaryKey="yes" />
10 <Column Id="Source" Type="binary" Width="0" /> 10 <Column Id="Source" Type="binary" Width="0" />
11 <Row> 11 <Row>
12 <Data Column="Column1">Row1</Data> 12 <Data Column="Column1" Value="Row1" />
13 <Data Column="Source">file1.txt</Data> 13 <Data Column="Source" Value="file1.txt" />
14 </Row> 14 </Row>
15 <Row> 15 <Row>
16 <Data Column="Source">SourceDir\file2.txt</Data> 16 <Data Column="Source" Value="SourceDir\file2.txt" />
17 <Data Column="Column1">Row2</Data> 17 <Data Column="Column1" Value="Row2" />
18 </Row> 18 </Row>
19 </CustomTable> 19 </CustomTable>
20 20
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">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-26 04:05:23 +0000