From ed0fb39537c0cfb13922537a26f9d895180d42d8 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 23 Jun 2020 00:56:36 -0700
Subject: Remove obsolete inner text handling

---
 .../BundleCustomTable/BundleCustomTable.wxs        | 24 +++++++++++-----------
 .../CustomAction/UnscheduledCustomAction.wxs       |  2 +-
 .../TestData/CustomTable/CustomTable.wxs           | 16 +++++++--------
 .../TestData/CustomTable/CustomTableWithFile.wxs   |  8 ++++----
 .../PackageComponents.wxs                          | 15 ++++++--------
 5 files changed, 31 insertions(+), 34 deletions(-)

(limited to 'src/test')

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 @@
             <BundleAttributeDefinition Id="Column2" />
 
             <BundleElement>
-                <BundleAttribute Id="Id">one</BundleAttribute>
-                <BundleAttribute Id="Column2">two</BundleAttribute>
+                <BundleAttribute Id="Id" Value="one" />
+                <BundleAttribute Id="Column2" Value="two" />
             </BundleElement>
             <BundleElement>
-                <BundleAttribute Id="Column2">&lt;</BundleAttribute>
-                <BundleAttribute Id="Id">&gt;</BundleAttribute>
+                <BundleAttribute Id="Column2" Value="&lt;" />
+                <BundleAttribute Id="Id" Value="&gt;" />
             </BundleElement>
         </BundleCustomData>
 
@@ -28,23 +28,23 @@
     <Fragment>
         <BundleCustomDataRef Id="BundleCustomTableBA">
             <BundleElement>
-                <BundleAttribute Id="Id">1</BundleAttribute>
-                <BundleAttribute Id="Column2">2</BundleAttribute>
+                <BundleAttribute Id="Id" Value="1" />
+                <BundleAttribute Id="Column2" Value="2" />
             </BundleElement>
         </BundleCustomDataRef>
 
         <BundleCustomDataRef Id="BundleCustomTableBE">
             <BundleElement>
-                <BundleAttribute Id="Id">one</BundleAttribute>
-                <BundleAttribute Id="Column2">two</BundleAttribute>
+                <BundleAttribute Id="Id" Value="one" />
+                <BundleAttribute Id="Column2" Value="two" />
             </BundleElement>
             <BundleElement>
-                <BundleAttribute Id="Column2">&lt;</BundleAttribute>
-                <BundleAttribute Id="Id">&gt;</BundleAttribute>
+                <BundleAttribute Id="Column2" Value="&lt;" />
+                <BundleAttribute Id="Id" Value="&gt;" />
             </BundleElement>
             <BundleElement>
-                <BundleAttribute Id="Id">1</BundleAttribute>
-                <BundleAttribute Id="Column2">2</BundleAttribute>
+                <BundleAttribute Id="Id" Value="1" />
+                <BundleAttribute Id="Column2" Value="2" />
             </BundleElement>
         </BundleCustomDataRef>
 
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 @@
         </InstallUISequence>
 
         <UI>
-            <ProgressText Action="CustomAction2">Progess2Text</ProgressText>
+            <ProgressText Action="CustomAction2" Message="Progess2Text" />
         </UI>
     </Fragment>
 </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 @@
             <Column Id="Column1" Type="string" PrimaryKey="yes" Category="text" Modularize="column" Description="The first custom column." />
             <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" Description="The custom table's Component reference" />
             <Row>
-                <Data Column="Column1">Row1</Data>
-                <Data Column="Component_">test.txt</Data>
+                <Data Column="Column1" Value="Row1" />
+                <Data Column="Component_" Value="test.txt" />
             </Row>
             <Row>
-                <Data Column="Column1">Row2</Data>
-                <Data Column="Component_">test.txt</Data>
+                <Data Column="Column1" Value="Row2" />
+                <Data Column="Component_" Value="test.txt" />
             </Row>
         </CustomTable>
 
@@ -22,12 +22,12 @@
             <Column Id="ColumnA" Type="string" PrimaryKey="yes" />
             <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" />
             <Row>
-                <Data Column="ColumnA">RowA</Data>
-                <Data Column="Component_">test.txt</Data>
+                <Data Column="ColumnA" Value="RowA" />
+                <Data Column="Component_" Value="test.txt" />
             </Row>
             <Row>
-                <Data Column="ColumnA">RowB</Data>
-                <Data Column="Component_">test.txt</Data>
+                <Data Column="ColumnA" Value="RowB" />
+                <Data Column="Component_" Value="test.txt" />
             </Row>
         </CustomTable>
     </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 @@
             <Column Id="Column1" Type="string" PrimaryKey="yes" />
             <Column Id="Source" Type="binary" Width="0" />
             <Row>
-                <Data Column="Column1">Row1</Data>
-                <Data Column="Source">file1.txt</Data>
+                <Data Column="Column1" Value="Row1" />
+                <Data Column="Source" Value="file1.txt" />
             </Row>
             <Row>
-                <Data Column="Source">SourceDir\file2.txt</Data>
-                <Data Column="Column1">Row2</Data>
+                <Data Column="Source" Value="SourceDir\file2.txt" />
+                <Data Column="Column1" Value="Row2" />
             </Row>
         </CustomTable>
 
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 @@
         <UI Id="CustomDialog">
             <Dialog Id="FirstDialog" Width="100" Height="100">
                 <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="FirstDialogTitle" />
-                <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader">
-                    <Condition Action="hide">Installed</Condition>
-                    <Condition Action="disable">Installed</Condition>
-                </Control>
+                <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader"
+                         HideCondition="Installed" DisableCondition="Installed" />
             </Dialog>
             <Dialog Id="SecondDialog" Width="100" Height="100">
                 <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" />
-                <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
-                    <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
-                </Control>
+                <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]"
+                         ShowCondition="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed" />
             </Dialog>
 
             <InstallUISequence>
@@ -29,8 +26,8 @@
             <Publish Dialog="FirstDialog" Control="Next" Event="NewDialog" Value="SecondDialog">Installed AND PATCH</Publish>
 
             <InstallUISequence>
-                <Show Dialog="FirstDialog" Before="SecondDialog">Installed AND PATCH</Show>
-                <Show Dialog="SecondDialog" Before="ExecuteAction">NOT Installed</Show>
+                <Show Dialog="FirstDialog" Before="SecondDialog" Condition="Installed AND PATCH" />
+                <Show Dialog="SecondDialog" Before="ExecuteAction" Condition="NOT Installed" />
             </InstallUISequence>
         </UI>
         <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-- 
cgit v1.2.3-55-g6feb