From 0dfddf11df6d5c06b40bfaabca116dea7717e801 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 4 Jun 2020 10:24:50 -0700
Subject: Add column tuples when created instead of after the table tuple
 creation

---
 src/WixToolset.Core/Compiler.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 35a73e00..83623883 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -3873,7 +3873,7 @@ namespace WixToolset.Core
                             attributes |= nullable ? WixCustomTableColumnTupleAttributes.Nullable : WixCustomTableColumnTupleAttributes.None;
                             attributes |= columnUnreal ? WixCustomTableColumnTupleAttributes.Unreal : WixCustomTableColumnTupleAttributes.None;
 
-                            columns.Add(new WixCustomTableColumnTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName))
+                            var column = this.Core.AddTuple(new WixCustomTableColumnTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName))
                             {
                                 TableRef = tableId,
                                 Name = columnName,
@@ -3889,6 +3889,7 @@ namespace WixToolset.Core
                                 Modularize = modularization,
                                 Set = setValues,
                             });
+                            columns.Add(column);
                         }
                         break;
                     case "Row":
@@ -3921,11 +3922,6 @@ namespace WixToolset.Core
                         ColumnNames = columnNames,
                         Unreal = unreal,
                     });
-
-                    foreach (var column in columns)
-                    {
-                        this.Core.AddTuple(column);
-                    }
                 }
             }
         }
-- 
cgit v1.2.3-55-g6feb