diff options
Diffstat (limited to 'src/WixToolset.Core/WixVariableResolver.cs')
-rw-r--r-- | src/WixToolset.Core/WixVariableResolver.cs | 8 |
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 | |||
9 | using System.Text; | 9 | using System.Text; |
10 | using System.Text.RegularExpressions; | 10 | using System.Text.RegularExpressions; |
11 | using WixToolset.Data; | 11 | using WixToolset.Data; |
12 | using WixToolset.Data.Rows; | 12 | using WixToolset.Data.Tuples; |
13 | using WixToolset.Extensibility; | 13 | using WixToolset.Extensibility; |
14 | 14 | ||
15 | /// <summary> | 15 | /// <summary> |
@@ -60,17 +60,17 @@ namespace WixToolset.Core | |||
60 | /// Add a variable. | 60 | /// Add a variable. |
61 | /// </summary> | 61 | /// </summary> |
62 | /// <param name="wixVariableRow">The WixVariableRow to add.</param> | 62 | /// <param name="wixVariableRow">The WixVariableRow to add.</param> |
63 | public void AddVariable(WixVariableRow wixVariableRow) | 63 | public void AddVariable(WixVariableTuple wixVariableRow) |
64 | { | 64 | { |
65 | try | 65 | try |
66 | { | 66 | { |
67 | this.wixVariables.Add(wixVariableRow.Id, wixVariableRow.Value); | 67 | this.wixVariables.Add(wixVariableRow.WixVariable, wixVariableRow.Value); |
68 | } | 68 | } |
69 | catch (ArgumentException) | 69 | catch (ArgumentException) |
70 | { | 70 | { |
71 | if (!wixVariableRow.Overridable) // collision | 71 | if (!wixVariableRow.Overridable) // collision |
72 | { | 72 | { |
73 | Messaging.Instance.OnMessage(WixErrors.WixVariableCollision(wixVariableRow.SourceLineNumbers, wixVariableRow.Id)); | 73 | Messaging.Instance.OnMessage(WixErrors.WixVariableCollision(wixVariableRow.SourceLineNumbers, wixVariableRow.WixVariable)); |
74 | } | 74 | } |
75 | } | 75 | } |
76 | } | 76 | } |