From a4be3486b60d232b546f438bc4bd7a4a80cf330c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 28 Feb 2019 16:56:01 -0800
Subject: Expose WixVariableResolver via WixToolsetServiceProvider

---
 src/WixToolset.Core/WixVariableResolver.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/WixToolset.Core/WixVariableResolver.cs')

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
         /// <summary>
         /// Instantiate a new WixVariableResolver.
         /// </summary>
-        public WixVariableResolver(IMessaging messaging)
+        internal WixVariableResolver(IServiceProvider serviceProvider)
         {
+            this.Messaging = serviceProvider.GetService<IMessaging>();
+
             this.locVariables = new Dictionary<string, BindVariable>();
             this.wixVariables = new Dictionary<string, BindVariable>();
             this.localizedControls = new Dictionary<string, LocalizedControl>();
             this.Codepage = -1;
-            this.Messaging = messaging;
         }
 
         private IMessaging Messaging { get; }
@@ -88,8 +89,6 @@ namespace WixToolset.Core
         /// <param name="value">The value to resolve.</param>
         /// <param name="localizationOnly">true to only resolve localization variables; false otherwise.</param>
         /// <param name="errorOnUnknown">true if unknown variables should throw errors.</param>
-        /// <param name="isDefault">true if the resolved value was the default.</param>
-        /// <param name="delayedResolve">true if the value has variables that cannot yet be resolved.</param>
         /// <returns>The resolved value.</returns>
         internal VariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly, bool errorOnUnknown)
         {
-- 
cgit v1.2.3-55-g6feb