Additional IR updates

4 files changed, 31 insertions, 41 deletions

diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/SymbolPathType.cs b/src/WixToolset.Data.WindowsInstaller/Rows/SymbolPathType.cs
deleted file mode 100644
index 964e1caa..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/SymbolPathType.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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 WixToolset.Data.Rows
-{
-    /// <summary>
-    /// The types that the WixDeltaPatchSymbolPaths table can hold.
-    /// </summary>
-    /// <remarks>The order of these values is important since WixDeltaPatchSymbolPaths are sorted by this type.</remarks>
-    public enum SymbolPathType
-    {
-        File,
-        Component,
-        Directory,
-        Media,
-        Product
-    };
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs
index 3009e59d..d1be706e 100644
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs
+++ b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs
@@ -8,27 +8,28 @@ namespace WixToolset.Data.Rows
     using System.Globalization;
     using System.Xml;
     using System.Xml.Schema;
+    using WixToolset.Data.Tuples;
 
     /// <summary>
     /// The Sequence tables that actions may belong to.
     /// </summary>
-    public enum SequenceTable
-    {
-        /// <summary>AdminUISequence</summary>
-        AdminUISequence,
+    //public enum SequenceTable
+    //{
+    //    /// <summary>AdminUISequence</summary>
+    //    AdminUISequence,
 
-        /// <summary>AdminExecuteSequence</summary>
-        AdminExecuteSequence,
+    //    /// <summary>AdminExecuteSequence</summary>
+    //    AdminExecuteSequence,
 
-        /// <summary>AdvtExecuteSequence</summary>
-        AdvtExecuteSequence,
+    //    /// <summary>AdvtExecuteSequence</summary>
+    //    AdvtExecuteSequence,
 
-        /// <summary>InstallUISequence</summary>
-        InstallUISequence,
+    //    /// <summary>InstallUISequence</summary>
+    //    InstallUISequence,
 
-        /// <summary>InstallExecuteSequence</summary>
-        InstallExecuteSequence
-    }
+    //    /// <summary>InstallExecuteSequence</summary>
+    //    InstallExecuteSequence
+    //}
 
     /// <summary>
     /// Specialization of a row for the sequence tables.
@@ -55,15 +56,15 @@ namespace WixToolset.Data.Rows
         /// <param name="action">The name of the standard action.</param>
         /// <param name="condition">The condition of the standard action.</param>
         /// <param name="sequence">The suggested sequence number of the standard action.</param>
-        private WixActionRow(SequenceTable sequenceTable, string action, string condition, int sequence) :
-            base(null, WindowsInstallerStandard.GetTableDefinitions()["WixAction"])
-        {
-            this.SequenceTable = sequenceTable;
-            this.Action = action;
-            this.Condition = condition;
-            this.Sequence = sequence;
-            this.Overridable = true; // all standard actions are overridable by default
-        }
+        //private WixActionRow(SequenceTable sequenceTable, string action, string condition, int sequence) :
+        //    base(null, WindowsInstallerStandard.GetTableDefinitions()["WixAction"])
+        //{
+        //    this.SequenceTable = sequenceTable;
+        //    this.Action = action;
+        //    this.Condition = condition;
+        //    this.Sequence = sequence;
+        //    this.Overridable = true; // all standard actions are overridable by default
+        //}
 
         /// <summary>
         /// Instantiates an ActionRow by copying data from another ActionRow.
@@ -296,13 +297,15 @@ namespace WixToolset.Data.Rows
             WixActionRow[] actionRows = new WixActionRow[sequenceCount];
             for (int i = 0; i < sequenceCount; i++)
             {
-                WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence);
-                actionRows[i] = actionRow;
+                //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence);
+                //actionRows[i] = actionRow;
+                throw new NotImplementedException();
             }
 
             return actionRows;
         }
 
+#if DEAD_CODE
         /// <summary>
         /// Determines whether this ActionRow contains the specified ActionRow as a child in its dependency tree.
         /// </summary>
@@ -370,5 +373,6 @@ namespace WixToolset.Data.Rows
                 }
             }
         }
+#endif
     }
 }
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs
index 513a104f..9fab6b5d 100644
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs
+++ b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Data.Rows
     using System.Collections;
     using System.Diagnostics;
     using System.Xml;
+    using WixToolset.Data.Tuples;
 
     /// <summary>
     /// A collection of action rows sorted by their sequence table and action name.
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs
index b6c0b840..3be5a56d 100644
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs
+++ b/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data.Rows
 {
+    using WixToolset.Data.Tuples;
+
     /// <summary>
     /// Specialization of a row for the WixDeltaPatchSymbolPaths table.
     /// </summary>