Add ability for an extension to have a custom strongly typed row during binding.

Remove some unused functionality in Table and Row.
Use strongRowType in core tables.

16 files changed, 136 insertions, 94 deletions

diff --git a/src/WixToolset.Data/WindowsInstaller/Row.cs b/src/WixToolset.Data/WindowsInstaller/Row.cs
index a7a63d58..af0a323e 100644
--- a/src/WixToolset.Data/WindowsInstaller/Row.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Row.cs
@@ -47,22 +47,6 @@ namespace WixToolset.Data.WindowsInstaller
         }
 
         /// <summary>
-        /// Creates a shallow copy of a row from another row.
-        /// </summary>
-        /// <param name="source">The row the data is copied from.</param>
-        protected Row(Row source)
-        {
-            this.Table = source.Table;
-            this.TableDefinition = source.TableDefinition;
-            this.Number = source.Number;
-            this.Operation = source.Operation;
-            this.Redundant = source.Redundant;
-            this.SectionId = source.SectionId;
-            this.SourceLineNumbers = source.SourceLineNumbers;
-            this.Fields = source.Fields;
-        }
-
-        /// <summary>
         /// Gets or sets the row transform operation.
         /// </summary>
         /// <value>The row transform operation.</value>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs
index bf962e73..20482560 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/BBControlRow.cs
@@ -19,6 +19,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public BBControlRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the dialog of the Control row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs
index 001703ee..b7836241 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/ComponentRow.cs
@@ -19,6 +19,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public ComponentRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the identifier for this Component row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs
index 95289dea..e0ae2de0 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/ControlRow.cs
@@ -19,6 +19,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public ControlRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the dialog of the Control row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs
index b931632f..b8fa5e83 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/MediaRow.cs
@@ -17,6 +17,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public MediaRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the disk id for this media row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs
index 3aba5de6..b4212430 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/PropertyRow.cs
@@ -17,6 +17,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public PropertyRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets and sets the property name for the row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs
index d757c8d3..dbbfa0f9 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/UpgradeRow.cs
@@ -17,6 +17,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public UpgradeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets and sets the upgrade code for the row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs
index f7bc784d..61240820 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixActionRow.cs
@@ -23,13 +23,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
-        /// <summary>
-        /// Instantiates an ActionRow by copying data from another ActionRow.
-        /// </summary>
-        /// <param name="source">The row the data is copied from.</param>
-        /// <remarks>The previous and next action collections are not copied.</remarks>
-        private WixActionRow(WixActionRow source)
-            : base(source)
+        public WixActionRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
         {
         }
 
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs
index 2abd7656..0e942724 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixComplexReferenceRow.cs
@@ -20,6 +20,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public WixComplexReferenceRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
+            : base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets the parent type of the complex reference.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.cs
index e59df729..bbdbc6b6 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixGroupRow.cs
@@ -19,6 +19,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public WixGroupRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
+            : base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the parent identifier of the complex reference.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs
index b2a64356..29479147 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixMediaTemplateRow.cs
@@ -17,6 +17,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public WixMediaTemplateRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
+            : base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the cabinet template name for this media template row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs
index 2f356b71..8a54d36e 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/WixPropertyRow.cs
@@ -18,6 +18,11 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
         }
 
+        public WixPropertyRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) :
+            base(sourceLineNumbers, tableDefinition)
+        {
+        }
+
         /// <summary>
         /// Gets and sets the id for this property row.
         /// </summary>
diff --git a/src/WixToolset.Data/WindowsInstaller/Table.cs b/src/WixToolset.Data/WindowsInstaller/Table.cs
index 54753dee..ca6fe3ba 100644
--- a/src/WixToolset.Data/WindowsInstaller/Table.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Table.cs
@@ -6,7 +6,6 @@ namespace WixToolset.Data.WindowsInstaller
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Xml;
-    using WixToolset.Data.WindowsInstaller.Rows;
 
     /// <summary>
     /// Object that represents a table in a database.
@@ -49,79 +48,14 @@ namespace WixToolset.Data.WindowsInstaller
         public IList<Row> Rows { get; }
 
         /// <summary>
-        /// Creates a new row in the table.
+        /// Creates a new row and adds it to the table.
         /// </summary>
         /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="add">Specifies whether to only create the row or add it to the table automatically.</param>
         /// <returns>Row created in table.</returns>
-        public Row CreateRow(SourceLineNumber sourceLineNumbers, bool add = true)
+        public Row CreateRow(SourceLineNumber sourceLineNumbers)
         {
-            Row row;
-
-            switch (this.Name)
-            {
-                case "BBControl":
-                    row = new BBControlRow(sourceLineNumbers, this);
-                    break;
-                case "Component":
-                    row = new ComponentRow(sourceLineNumbers, this);
-                    break;
-                case "Control":
-                    row = new ControlRow(sourceLineNumbers, this);
-                    break;
-                case "File":
-                    row = new FileRow(sourceLineNumbers, this);
-                    break;
-                case "Media":
-                    row = new MediaRow(sourceLineNumbers, this);
-                    break;
-                case "Property":
-                    row = new PropertyRow(sourceLineNumbers, this);
-                    break;
-                case "Upgrade":
-                    row = new UpgradeRow(sourceLineNumbers, this);
-                    break;
-                case "WixAction":
-                    row = new WixActionRow(sourceLineNumbers, this);
-                    break;
-                case "WixComplexReference":
-                    row = new WixComplexReferenceRow(sourceLineNumbers, this);
-                    break;
-                case "WixDeltaPatchFile":
-                    row = new WixDeltaPatchFileRow(sourceLineNumbers, this);
-                    break;
-                case "WixDeltaPatchSymbolPaths":
-                    row = new WixDeltaPatchSymbolPathsRow(sourceLineNumbers, this);
-                    break;
-                case "WixGroup":
-                    row = new WixGroupRow(sourceLineNumbers, this);
-                    break;
-                case "WixMedia":
-                    row = new WixMediaRow(sourceLineNumbers, this);
-                    break;
-                case "WixMediaTemplate":
-                    row = new WixMediaTemplateRow(sourceLineNumbers, this);
-                    break;
-                case "WixMerge":
-                    row = new WixMergeRow(sourceLineNumbers, this);
-                    break;
-                case "WixProperty":
-                    row = new WixPropertyRow(sourceLineNumbers, this);
-                    break;
-                case "WixSimpleReference":
-                    row = new WixSimpleReferenceRow(sourceLineNumbers, this);
-                    break;
-
-                default:
-                    row = new Row(sourceLineNumbers, this);
-                    break;
-            }
-
-            if (add)
-            {
-                this.Rows.Add(row);
-            }
-
+            var row = this.Definition.CreateRow(sourceLineNumbers, this);
+            this.Rows.Add(row);
             return row;
         }
 
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
index 7c4a3e9d..9ec37895 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
@@ -26,18 +26,22 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="columns">Column definitions for the table.</param>
         /// <param name="unreal">Flag if table is unreal.</param>
         /// <param name="tupleIdIsPrimaryKey">Whether the primary key is the id of the tuple definition associated with this table.</param>
-        public TableDefinition(string name, IntermediateTupleDefinition tupleDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool tupleIdIsPrimaryKey = false)
+        public TableDefinition(string name, IntermediateTupleDefinition tupleDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool tupleIdIsPrimaryKey = false, Type strongRowType = null)
         {
             this.Name = name;
             this.TupleDefinition = tupleDefinition;
             this.TupleIdIsPrimaryKey = tupleIdIsPrimaryKey;
             this.Unreal = unreal;
             this.Columns = columns?.ToArray();
+            this.StrongRowType = strongRowType ?? typeof(Row);
 
             if (this.Columns == null || this.Columns.Length == 0)
             {
                 throw new ArgumentOutOfRangeException(nameof(columns));
             }
+#if DEBUG
+            if (this.StrongRowType != typeof(Row) && !this.StrongRowType.IsSubclassOf(typeof(Row))) { throw new ArgumentException(nameof(strongRowType)); }
+#endif
         }
 
         /// <summary>
@@ -70,6 +74,8 @@ namespace WixToolset.Data.WindowsInstaller
         /// <value>Flag if table is unreal.</value>
         public bool TupleIdIsPrimaryKey { get; }
 
+        private Type StrongRowType { get; }
+
         /// <summary>
         /// Gets the column definition in the table by index.
         /// </summary>
@@ -78,6 +84,31 @@ namespace WixToolset.Data.WindowsInstaller
         public ColumnDefinition this[int columnIndex] => this.Columns[columnIndex];
 
         /// <summary>
+        /// In general this method shouldn't be used - create rows from a Table instead.
+        /// Creates a new row object of the type specified in this definition.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <returns>Created row.</returns>
+        public Row CreateRow(SourceLineNumber sourceLineNumbers)
+        {
+            var result = (Row)Activator.CreateInstance(this.StrongRowType, sourceLineNumbers, this);
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a new row object of the type specified in this definition for the given table.
+        /// External callers should create the row from the table.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
+        /// <param name="table">The owning table for this row.</param>
+        /// <returns>Created row.</returns>
+        internal Row CreateRow(SourceLineNumber sourceLineNumbers, Table table)
+        {
+            var result = (Row)Activator.CreateInstance(this.StrongRowType, sourceLineNumbers, table);
+            return result;
+        }
+
+        /// <summary>
         /// Compares this table definition to another table definition.
         /// </summary>
         /// <remarks>
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
index f6c07a83..3a1a8916 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data.WindowsInstaller
 {
+    using WixToolset.Data.WindowsInstaller.Rows;
+
     public static class WindowsInstallerTableDefinitions
     {
         public static readonly TableDefinition ActionText = new TableDefinition(
@@ -111,6 +113,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of property, uppercase if settable by launcher or loader.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "String value for property.  Never null or empty."),
             },
+            strongRowType: typeof(PropertyRow),
             tupleIdIsPrimaryKey: true
         );
 
@@ -129,6 +132,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied to this control."),
                 new ColumnDefinition("Text", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "A string used to set the initial text contained within a control (if appropriate)."),
             },
+            strongRowType: typeof(BBControlRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -200,6 +204,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("DiskId", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 32767, description: "Disk identifier for the file.", unreal: true),
                 new ColumnDefinition("Source", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Path to source of file.", unreal: true),
             },
+            strongRowType: typeof(FileRow),
             tupleIdIsPrimaryKey: true
         );
 
@@ -258,6 +263,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
                 new ColumnDefinition("KeyPath", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File;Registry;ODBCDataSource", keyColumn: 1, description: "Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.", modularizeType: ColumnModularizeType.Column),
             },
+            strongRowType: typeof(ComponentRow),
             tupleIdIsPrimaryKey: true
         );
 
@@ -353,6 +359,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Control_Next", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Control", keyColumn: 2, description: "The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!"),
                 new ColumnDefinition("Help", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The help strings used with the button. The text is optional. "),
             },
+            strongRowType: typeof(ControlRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -708,6 +715,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("VolumeLabel", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The label attributed to the volume."),
                 new ColumnDefinition("Source", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Property, description: "The property defining the location of the cabinet file."),
             },
+            strongRowType: typeof(MediaRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1330,6 +1338,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Remove", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The list of features to remove when uninstalling a product from this set.  The default is \"ALL\"."),
                 new ColumnDefinition("ActionProperty", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.UpperCase, description: "The property to set when a product in this set is found."),
             },
+            strongRowType: typeof(UpgradeRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1666,6 +1675,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Overridable", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixActionRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1695,6 +1705,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixComplexReferenceRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1814,6 +1825,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("ChildType", ColumnType.String, 0, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "Primary key used to identify a particular child type in a child table."),
             },
             unreal: true,
+            strongRowType: typeof(WixGroupRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1923,6 +1935,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Layout", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixMediaRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1939,6 +1952,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("MaximumCabinetSizeForLargeFileSplitting", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixMediaTemplateRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -1957,6 +1971,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Feature_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixMergeRow),
             tupleIdIsPrimaryKey: true
         );
 
@@ -1987,6 +2002,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("SymbolPaths", ColumnType.Preserved, 0, primaryKey: false, nullable: true, ColumnCategory.Text),
             },
             unreal: true,
+            strongRowType: typeof(WixDeltaPatchFileRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -2000,6 +2016,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("SymbolPaths", ColumnType.Preserved, 0, primaryKey: false, nullable: false, ColumnCategory.Text),
             },
             unreal: true,
+            strongRowType: typeof(WixDeltaPatchSymbolPathsRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -2012,6 +2029,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixPropertyRow),
             tupleIdIsPrimaryKey: false
         );
 
@@ -2024,6 +2042,7 @@ namespace WixToolset.Data.WindowsInstaller
                 new ColumnDefinition("PrimaryKeys", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             unreal: true,
+            strongRowType: typeof(WixSimpleReferenceRow),
             tupleIdIsPrimaryKey: false
         );
 
diff --git a/src/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs b/src/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs
new file mode 100644
index 00000000..5621a756
--- /dev/null
+++ b/src/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs
@@ -0,0 +1,29 @@
+// 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 WixToolsetTest.Data
+{
+    using WixToolset.Data.WindowsInstaller;
+    using Xunit;
+
+    public class WindowsInstallerTableDefinitionsFixture
+    {
+        [Fact]
+        public void CanCreateWindowsInstallerRows()
+        {
+            foreach (var tableDefinition in WindowsInstallerTableDefinitions.All)
+            {
+                var table = new Table(tableDefinition);
+                var rowFromTable = table.CreateRow(null);
+                var rowFromTableDefinition = tableDefinition.CreateRow(null);
+                var expectedRowTypeName = tableDefinition.Name.Replace("_", "") + "Row";
+                var expectedRowType = rowFromTable.GetType();
+
+                Assert.Equal(expectedRowType, rowFromTableDefinition.GetType());
+                if (typeof(Row) != expectedRowType)
+                {
+                    Assert.Equal(expectedRowTypeName, expectedRowType.Name);
+                }
+            }
+        }
+    }
+}