aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/WixVariableResolver.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/WixVariableResolver.cs')
-rw-r--r--src/WixToolset.Core/WixVariableResolver.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/WixToolset.Core/WixVariableResolver.cs b/src/WixToolset.Core/WixVariableResolver.cs
index 75851a56..9d604065 100644
--- a/src/WixToolset.Core/WixVariableResolver.cs
+++ b/src/WixToolset.Core/WixVariableResolver.cs
@@ -21,13 +21,14 @@ namespace WixToolset.Core
21 /// <summary> 21 /// <summary>
22 /// Instantiate a new WixVariableResolver. 22 /// Instantiate a new WixVariableResolver.
23 /// </summary> 23 /// </summary>
24 public WixVariableResolver(IMessaging messaging) 24 internal WixVariableResolver(IServiceProvider serviceProvider)
25 { 25 {
26 this.Messaging = serviceProvider.GetService<IMessaging>();
27
26 this.locVariables = new Dictionary<string, BindVariable>(); 28 this.locVariables = new Dictionary<string, BindVariable>();
27 this.wixVariables = new Dictionary<string, BindVariable>(); 29 this.wixVariables = new Dictionary<string, BindVariable>();
28 this.localizedControls = new Dictionary<string, LocalizedControl>(); 30 this.localizedControls = new Dictionary<string, LocalizedControl>();
29 this.Codepage = -1; 31 this.Codepage = -1;
30 this.Messaging = messaging;
31 } 32 }
32 33
33 private IMessaging Messaging { get; } 34 private IMessaging Messaging { get; }
@@ -88,8 +89,6 @@ namespace WixToolset.Core
88 /// <param name="value">The value to resolve.</param> 89 /// <param name="value">The value to resolve.</param>
89 /// <param name="localizationOnly">true to only resolve localization variables; false otherwise.</param> 90 /// <param name="localizationOnly">true to only resolve localization variables; false otherwise.</param>
90 /// <param name="errorOnUnknown">true if unknown variables should throw errors.</param> 91 /// <param name="errorOnUnknown">true if unknown variables should throw errors.</param>
91 /// <param name="isDefault">true if the resolved value was the default.</param>
92 /// <param name="delayedResolve">true if the value has variables that cannot yet be resolved.</param>
93 /// <returns>The resolved value.</returns> 92 /// <returns>The resolved value.</returns>
94 internal VariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly, bool errorOnUnknown) 93 internal VariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly, bool errorOnUnknown)
95 { 94 {