Expose table definitions from IWindowsInstallerBackendBinderExtension

3 files changed, 12 insertions, 14 deletions

diff --git a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
index 0eed98af..6e13b625 100644
--- a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
+++ b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
+    using System.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
     using WixToolset.Data.WindowsInstaller;
@@ -30,9 +31,9 @@ namespace WixToolset.Extensibility
         protected IWindowsInstallerBackendHelper BackendHelper { get; private set; }
 
         /// <summary>
-        /// Optional table definitions to automatically map to tuples.
+        /// Optional table definitions.
         /// </summary>
-        protected virtual TableDefinition[] TableDefinitionsForTuples { get; }
+        public virtual IEnumerable<TableDefinition> TableDefinitions => Enumerable.Empty<TableDefinition>();
 
         /// <summary>
         /// Creates a resolved cabinet result.
@@ -48,21 +49,15 @@ namespace WixToolset.Extensibility
             this.BackendHelper = context.ServiceProvider.GetService<IWindowsInstallerBackendHelper>();
         }
 
-        public virtual IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files)
-        {
-            return null;
-        }
+        public virtual IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files) => null;
 
-        public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory)
-        {
-            return null;
-        }
+        public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null;
 
         public virtual bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output)
         {
-            if (this.TableDefinitionsForTuples != null)
+            if (this.TableDefinitions.Any())
             {
-                return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitionsForTuples);
+                return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions);
             }
 
             return false;
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
index 22939103..167e1083 100644
--- a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
@@ -13,6 +13,8 @@ namespace WixToolset.Extensibility
     /// </summary>
     public interface IWindowsInstallerBackendBinderExtension
     {
+        IEnumerable<TableDefinition> TableDefinitions { get; }
+
         /// <summary>
         /// Called before binding occurs.
         /// </summary>
diff --git a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
index 573620df..4552c7cb 100644
--- a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Extensibility.Services
 {
+    using System.Collections.Generic;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
 
@@ -10,8 +11,8 @@ namespace WixToolset.Extensibility.Services
     /// </summary>
     public interface IWindowsInstallerBackendHelper
     {
-        bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, TableDefinition[] tableDefinitions);
+        bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable<TableDefinition> tableDefinitions);
 
-        bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, TableDefinition[] tableDefinitions, bool columnZeroIsId);
+        bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable<TableDefinition> tableDefinitions, bool columnZeroIsId);
     }
 }