From fcd88ec3995033bf802f0a637e7fce65e8739006 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 5 Apr 2020 19:15:44 +1000
Subject: Add test around ActionText and fix the table definition to get it
 passing.

---
 src/test/Example.Extension/Example.Extension.csproj               | 2 +-
 src/test/Example.Extension/ExampleTableDefinitions.cs             | 7 ++++---
 src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs        | 2 ++
 .../TestData/CustomAction/UnscheduledCustomAction.wxs             | 8 ++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/test')

diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index 8b4d4e86..d9ac2509 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
@@ -33,7 +33,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="SetExtensionWixlib" Inputs="@(ExtensionWxs)" Outputs="$(WixlibPath)">
+  <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibExePath)" Outputs="$(WixlibPath)">
     <Exec Command='$(CompileWixlibExePath) "$(IntermediateOutputPath)\" "$(WixlibPath)" "@(ExtensionWxs)"' />
   </Target>
 </Project>
diff --git a/src/test/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs
index 5dbf6d64..124e2406 100644
--- a/src/test/Example.Extension/ExampleTableDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTableDefinitions.cs
@@ -8,13 +8,14 @@ namespace Example.Extension
     {
         public static readonly TableDefinition ExampleTable = new TableDefinition(
             "Wix4Example",
-            ExampleTupleDefinitions.Example.Name,
             new[]
             {
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
                 new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
-            }
-            );
+            },
+            tupleDefinitionName: ExampleTupleDefinitions.Example.Name,
+            tupleIdIsPrimaryKey: true
+        );
 
         public static readonly TableDefinition[] All = new[] { ExampleTable };
     }
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 6b9f8af6..9462c4ff 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -313,6 +313,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] {
+                    "ActionText",
                     "AdminExecuteSequence",
                     "AdminUISequence",
                     "AdvtExecuteSequence",
@@ -324,6 +325,7 @@ namespace WixToolsetTest.CoreIntegration
                 }).Where(x => !x.StartsWith("Property:") || x.StartsWith("Property:MsiHiddenProperties\t")).ToArray();
                 Assert.Equal(new[]
                 {
+                    "ActionText:CustomAction2\tProgess2Text\t",
                     "AdminExecuteSequence:CostFinalize\t\t1000",
                     "AdminExecuteSequence:CostInitialize\t\t800",
                     "AdminExecuteSequence:CustomAction2\t\t801",
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
index 780529d6..2846d16e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
@@ -2,10 +2,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
+            <ComponentGroupRef Id="MinimalComponentGroup" />
         </ComponentGroup>
 
-        <Binary Id="Binary1" SourceFile="test.txt"></Binary>
+        <Binary Id="Binary1" SourceFile="test.txt" />
         <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" />
         <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
         <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" />
@@ -25,5 +25,9 @@
         <InstallUISequence>
             <Custom Action="CustomAction2" After="CostInitialize" />
         </InstallUISequence>
+
+        <UI>
+            <ProgressText Action="CustomAction2">Progess2Text</ProgressText>
+        </UI>
     </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb