Fix bug in ParseHelper where it assumed the first column was the id column.

1 files changed, 1 insertions, 17 deletions

diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 2a851a21..ed529dbb 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -981,23 +981,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
         private static IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, Identifier identifier)
         {
-            var tuple = tupleDefinition.CreateTuple(sourceLineNumbers, identifier);
-
-            if (null != identifier)
-            {
-                if (tuple.Definition.FieldDefinitions[0].Type == IntermediateFieldType.Number)
-                {
-                    tuple.Set(0, Convert.ToInt32(identifier.Id));
-                }
-                else
-                {
-                    tuple.Set(0, identifier.Id);
-                }
-            }
-
-            section.Tuples.Add(tuple);
-
-            return tuple;
+            return section.AddTuple(tupleDefinition.CreateTuple(sourceLineNumbers, identifier));
         }
 
         private static bool TryFindExtension(IEnumerable<ICompilerExtension> extensions, XNamespace ns, out ICompilerExtension extension)