Support MSI backends creating custom tables and remove WixToolset.Data.WindowsInstaller

7 files changed, 65 insertions, 5 deletions

diff --git a/src/test/TestData/Example.Extension/ExampleExtensionData.cs b/src/test/TestData/Example.Extension/ExampleExtensionData.cs
index 6b179ea6..724f9eea 100644
--- a/src/test/TestData/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/TestData/Example.Extension/ExampleExtensionData.cs
@@ -19,7 +19,7 @@ namespace Example.Extension
             switch (name)
             {
                 case "Example":
-                    tupleDefinition = TupleDefinitions.Example;
+                    tupleDefinition = ExampleTupleDefinitions.Example;
                     break;
 
                 default:
diff --git a/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs b/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
index b91d06e9..a081b758 100644
--- a/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
+++ b/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
@@ -28,6 +28,10 @@ namespace Example.Extension
             {
                 extension = new ExampleExtensionData();
             }
+            else if (extensionType == typeof(IWindowsInstallerBackendExtension))
+            {
+                extension = new ExampleWindowsInstallerBackendExtension();
+            }
             else
             {
                 extension = null;
diff --git a/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs b/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
new file mode 100644
index 00000000..870b02e1
--- /dev/null
+++ b/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace Example.Extension
+{
+    using System.Collections.Generic;
+    using WixToolset.Data.WindowsInstaller;
+
+    public static class ExampleTableDefinitions
+    {
+        public static readonly TableDefinition ExampleTable = new TableDefinition(
+            "Example",
+            new List<ColumnDefinition>
+            {
+                new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
+                new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
+            }
+            );
+
+        public static readonly TableDefinition[] All = new[] { ExampleTable };
+    }
+}
diff --git a/src/test/TestData/Example.Extension/ExampleTuple.cs b/src/test/TestData/Example.Extension/ExampleTuple.cs
index f280a5c8..0fc0d82c 100644
--- a/src/test/TestData/Example.Extension/ExampleTuple.cs
+++ b/src/test/TestData/Example.Extension/ExampleTuple.cs
@@ -12,11 +12,11 @@ namespace Example.Extension
 
     public class ExampleTuple : IntermediateTuple
     {
-        public ExampleTuple() : base(TupleDefinitions.Example, null, null)
+        public ExampleTuple() : base(ExampleTupleDefinitions.Example, null, null)
         {
         }
 
-        public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Example, sourceLineNumber, id)
+        public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.Example, sourceLineNumber, id)
         {
         }
 
diff --git a/src/test/TestData/Example.Extension/TupleDefinitions.cs b/src/test/TestData/Example.Extension/ExampleTupleDefinitions.cs
index 2c320fbc..4775b827 100644
--- a/src/test/TestData/Example.Extension/TupleDefinitions.cs
+++ b/src/test/TestData/Example.Extension/ExampleTupleDefinitions.cs
@@ -4,10 +4,12 @@ namespace Example.Extension
 {
     using WixToolset.Data;
 
-    public static class TupleDefinitions
+    public static class ExampleTupleDefinitions
     {
+        public const string ExampleName = "Example";
+
         public static readonly IntermediateTupleDefinition Example = new IntermediateTupleDefinition(
-            "Example",
+            ExampleName,
             new[]
             {
                 new IntermediateFieldDefinition(nameof(ExampleTupleFields.Example), IntermediateFieldType.String),
diff --git a/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
new file mode 100644
index 00000000..f00a5102
--- /dev/null
+++ b/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace Example.Extension
+{
+    using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility;
+
+    internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension
+    {
+        public override bool TryAddTupleToOutput(IntermediateTuple tuple, Output output)
+        {
+#if ALTERNATIVE_TO_USING_HELPER
+            switch (tuple.Definition.Name)
+            {
+                case TupleDefinitions.ExampleName:
+                    {
+                        var table = output.EnsureTable(ExampleTableDefinitions.ExampleTable);
+                        var row = table.CreateRow(tuple.SourceLineNumbers);
+                        row[0] = tuple[0].AsString();
+                        row[1] = tuple[1].AsString();
+                    }
+                    return true;
+            }
+
+            return false;
+#else
+            return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, ExampleTableDefinitions.All);
+#endif
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
index d99f53ec..8c603588 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
@@ -7,6 +7,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolsetTest.CoreIntegration.Utility;
     using Xunit;