Update to WiX Intermediate Representation

1 files changed, 4 insertions, 4 deletions

diff --git a/src/WixToolset.Core/WixVariableResolver.cs b/src/WixToolset.Core/WixVariableResolver.cs
index 357ff700..c4572d33 100644
--- a/src/WixToolset.Core/WixVariableResolver.cs
+++ b/src/WixToolset.Core/WixVariableResolver.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Core
     using System.Text;
     using System.Text.RegularExpressions;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.Tuples;
     using WixToolset.Extensibility;
 
     /// <summary>
@@ -60,17 +60,17 @@ namespace WixToolset.Core
         /// Add a variable.
         /// </summary>
         /// <param name="wixVariableRow">The WixVariableRow to add.</param>
-        public void AddVariable(WixVariableRow wixVariableRow)
+        public void AddVariable(WixVariableTuple wixVariableRow)
         {
             try
             {
-                this.wixVariables.Add(wixVariableRow.Id, wixVariableRow.Value);
+                this.wixVariables.Add(wixVariableRow.WixVariable, wixVariableRow.Value);
             }
             catch (ArgumentException)
             {
                 if (!wixVariableRow.Overridable) // collision
                 {
-                    Messaging.Instance.OnMessage(WixErrors.WixVariableCollision(wixVariableRow.SourceLineNumbers, wixVariableRow.Id));
+                    Messaging.Instance.OnMessage(WixErrors.WixVariableCollision(wixVariableRow.SourceLineNumbers, wixVariableRow.WixVariable));
                 }
             }
         }