From df69d4172d3117d8b66ba51fa5ae7f4be538700d Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 11 Apr 2020 16:03:19 +1000
Subject: Move table definitions from Core to Data.

---
 .../Bind/AttachPatchTransformsCommand.cs                               | 3 +--
 src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | 1 -
 .../Bind/LoadTableDefinitionsCommand.cs                                | 2 +-
 src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs    | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Bind')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
index aa5ca20a..f4fa510f 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
@@ -7,7 +7,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
-    using WixToolset.Core.WindowsInstaller;
     using WixToolset.Core.WindowsInstaller.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
@@ -58,7 +57,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public AttachPatchTransformsCommand(IMessaging messaging, Intermediate intermediate, IEnumerable<PatchTransform> transforms)
         {
-            this.tableDefinitions = new TableDefinitionCollection(WindowsInstallerStandardInternal.GetTableDefinitions());
+            this.tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All);
             this.Messaging = messaging;
             this.Intermediate = intermediate;
             this.Transforms = transforms;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 7de1b1d0..15b53a55 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -206,7 +206,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     break;
 
                 // ignored.
-                case TupleDefinitionType.WixFile:
                 case TupleDefinitionType.WixComponentGroup:
                 case TupleDefinitionType.WixDeltaPatchFile:
                 case TupleDefinitionType.WixFeatureGroup:
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
index fe13391b..024857ab 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
@@ -31,7 +31,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public TableDefinitionCollection Execute()
         {
-            var tableDefinitions = new TableDefinitionCollection(WindowsInstallerStandardInternal.GetTableDefinitions());
+            var tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All);
 
             foreach (var tuple in this.Section.Tuples.OfType<WixCustomTableTuple>())
             {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
index 749f9ac0..fe014b0b 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
@@ -470,7 +470,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         }
                         break;
                     case TupleDefinitionType.IniFile:
-                    case TupleDefinitionType.RemoveIniFile:
                         set.Add("InstallExecuteSequence/WriteIniValues");
                         set.Add("InstallExecuteSequence/RemoveIniValues");
                         break;
-- 
cgit v1.2.3-55-g6feb