Add test around ActionText and fix the table definition to get it passing.
Sean Hall committed
Apr 5, 2020 at 19:15 UTC
fcd88ec3995033bf802f0a637e7fce65e8739006
5 files changed
+14
-7
src/WixToolset.Core.WindowsInstaller/Data/tables.xml
+1
-1
@@ -3,7 +3,7 @@
3
4
5
<tableDefinitions xmlns="http://wixtoolset.org/schemas/v4/wi/tables">
6
- <tableDefinition name="ActionText">
6
+ <tableDefinition name="ActionText" tupleIdIsPrimaryKey="no">
7
<columnDefinition name="Action" type="string" length="72" primaryKey="yes" modularize="column"
8
category="identifier" description="Name of action to be described."/>
9
<columnDefinition name="Description" type="localized" length="0" nullable="yes" escapeIdtCharacters="yes"
src/test/Example.Extension/Example.Extension.csproj
+1
-1
@@ -33,7 +33,7 @@
33
</ItemGroup>
34
</Target>
35
36
- <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="SetExtensionWixlib" Inputs="@(ExtensionWxs)" Outputs="$(WixlibPath)">
36
+ <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibExePath)" Outputs="$(WixlibPath)">
37
<Exec Command='$(CompileWixlibExePath) "$(IntermediateOutputPath)\" "$(WixlibPath)" "@(ExtensionWxs)"' />
38
</Target>
39
</Project>
src/test/Example.Extension/ExampleTableDefinitions.cs
+4
-3
@@ -8,13 +8,14 @@ namespace Example.Extension
8
{
9
public static readonly TableDefinition ExampleTable = new TableDefinition(
10
"Wix4Example",
11
- ExampleTupleDefinitions.Example.Name,
11
new[]
12
{
13
new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
14
new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
16
- }
17
- );
15
+ },
16
+ tupleDefinitionName: ExampleTupleDefinitions.Example.Name,
17
+ tupleIdIsPrimaryKey: true
18
+ );
19
20
public static readonly TableDefinition[] All = new[] { ExampleTable };
21
}
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+2
@@ -313,6 +313,7 @@ namespace WixToolsetTest.CoreIntegration
313
314
Assert.True(File.Exists(msiPath));
315
var results = Query.QueryDatabase(msiPath, new[] {
316
+ "ActionText",
317
"AdminExecuteSequence",
318
"AdminUISequence",
319
"AdvtExecuteSequence",
@@ -324,6 +325,7 @@ namespace WixToolsetTest.CoreIntegration
325
}).Where(x => !x.StartsWith("Property:") || x.StartsWith("Property:MsiHiddenProperties\t")).ToArray();
326
Assert.Equal(new[]
327
{
328
+ "ActionText:CustomAction2\tProgess2Text\t",
329
"AdminExecuteSequence:CostFinalize\t\t1000",
330
"AdminExecuteSequence:CostInitialize\t\t800",
331
"AdminExecuteSequence:CustomAction2\t\t801",
src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+6
-2
@@ -2,10 +2,10 @@
2
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
<Fragment>
4
<ComponentGroup Id="ProductComponents">
5
- <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
5
+ <ComponentGroupRef Id="MinimalComponentGroup" />
6
</ComponentGroup>
7
8
- <Binary Id="Binary1" SourceFile="test.txt"></Binary>
8
+ <Binary Id="Binary1" SourceFile="test.txt" />
9
<CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" />
10
<CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
11
<CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" />
@@ -25,5 +25,9 @@
25
<InstallUISequence>
26
<Custom Action="CustomAction2" After="CostInitialize" />
27
</InstallUISequence>
28
+
29
+ <UI>
30
+ <ProgressText Action="CustomAction2">Progess2Text</ProgressText>
31
+ </UI>
32
</Fragment>
33
</Wix>