Rename IBindVariableResolver to IVariableResolve and merge ILocalizer plus improve IResolveContext

5 files changed, 53 insertions, 34 deletions

diff --git a/src/WixToolset.Extensibility/ILocalizer.cs b/src/WixToolset.Extensibility/ILocalizer.cs
deleted file mode 100644
index 3ce29aab..00000000
--- a/src/WixToolset.Extensibility/ILocalizer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Extensibility
-{
-    using WixToolset.Data;
-
-    public interface ILocalizer
-    {
-        int Codepage { get; }
-
-        string GetLocalizedValue(string id);
-
-        LocalizedControl GetLocalizedControl(string dialog, string control);
-    }
-}
diff --git a/src/WixToolset.Extensibility/IResolveContext.cs b/src/WixToolset.Extensibility/IResolveContext.cs
index 026e5a35..e03e6689 100644
--- a/src/WixToolset.Extensibility/IResolveContext.cs
+++ b/src/WixToolset.Extensibility/IResolveContext.cs
@@ -17,10 +17,14 @@ namespace WixToolset.Extensibility
 
         IEnumerable<IResolverExtension> Extensions { get; set; }
 
+        IEnumerable<IExtensionData> ExtensionData { get; set; }
+
         string IntermediateFolder { get; set; }
 
         Intermediate IntermediateRepresentation { get; set; }
 
-        IBindVariableResolver WixVariableResolver { get; set; }
+        IEnumerable<Localization> Localizations { get; set; }
+
+        IVariableResolver VariableResolver { get; set; }
     }
 }
diff --git a/src/WixToolset.Extensibility/Services/IBindVariableResolver.cs b/src/WixToolset.Extensibility/Services/IBindVariableResolver.cs
deleted file mode 100644
index 50071658..00000000
--- a/src/WixToolset.Extensibility/Services/IBindVariableResolver.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Extensibility.Services
-{
-    using WixToolset.Data;
-
-    public interface IBindVariableResolver
-    {
-        int VariableCount { get; }
-
-        void AddVariable(string name, string value, bool overridable);
-
-        BindVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly);
-
-        bool TryGetLocalizedControl(string dialog, string control, out LocalizedControl localizedControl);
-    }
-}
diff --git a/src/WixToolset.Extensibility/Services/IVariableResolver.cs b/src/WixToolset.Extensibility/Services/IVariableResolver.cs
new file mode 100644
index 00000000..ce11aa81
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/IVariableResolver.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility.Services
+{
+    using WixToolset.Data;
+
+    public interface IVariableResolver
+    {
+        /// <summary>
+        /// Gets the codepage.
+        /// </summary>
+        int Codepage { get; }
+
+        /// <summary>
+        /// Gets the count of variables added to the resolver.
+        /// </summary>
+        int VariableCount { get; }
+
+        void AddLocalization(Localization localization);
+
+        /// <summary>
+        /// Add a variable.
+        /// </summary>
+        /// <param name="name">The name of the variable.</param>
+        /// <param name="value">The value of the variable.</param>
+        /// <param name="overridable">Indicates whether the variable can be overridden by an existing variable.</param>
+        void AddVariable(SourceLineNumber sourceLineNumber, string name, string value, bool overridable);
+
+        /// <summary>
+        /// Resolve the wix variables in a value.
+        /// </summary>
+        /// <param name="sourceLineNumbers">The source line information for the value.</param>
+        /// <param name="value">The value to resolve.</param>
+        /// <param name="localizationOnly">true to only resolve localization variables; false otherwise.</param>
+        /// <returns>The resolved result.</returns>
+        VariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly);
+
+        /// <summary>
+        /// Try to find localization information for dialog and (optional) control.
+        /// </summary>
+        /// <param name="dialog">Dialog identifier.</param>
+        /// <param name="control">Optional control identifier.</param>
+        /// <param name="localizedControl">Found localization information.</param>
+        /// <returns>True if localized control was found, otherwise false.</returns>
+        bool TryGetLocalizedControl(string dialog, string control, out LocalizedControl localizedControl);
+    }
+}
diff --git a/src/WixToolset.Extensibility/Services/BindVariableResolution.cs b/src/WixToolset.Extensibility/Services/VariableResolution.cs
index cdd1fa19..2974e84f 100644
--- a/src/WixToolset.Extensibility/Services/BindVariableResolution.cs
+++ b/src/WixToolset.Extensibility/Services/VariableResolution.cs
@@ -2,7 +2,7 @@
 
 namespace WixToolset.Extensibility.Services
 {
-    public class BindVariableResolution
+    public class VariableResolution
     {
         /// <summary>
         /// Indicates whether the variable should be delay resolved.