1 files changed, 46 insertions, 45 deletions

diff --git a/src/WixToolset.Core/Localizer.cs b/src/WixToolset.Core/Localizer.cs
index 8265c026..d4f89e7a 100644
--- a/src/WixToolset.Core/Localizer.cs
+++ b/src/WixToolset.Core/Localizer.cs
@@ -9,6 +9,7 @@ namespace WixToolset.Core
     using WixToolset.Data.Rows;
     using WixToolset.Core.Native;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Parses localization files and localizes database values.
@@ -24,7 +25,7 @@ namespace WixToolset.Core
         /// <summary>
         /// Instantiate a new Localizer.
         /// </summary>
-        public Localizer(IEnumerable<Localization> localizations)
+        public Localizer(IMessaging messaging, IEnumerable<Localization> localizations)
         {
             this.Codepage = -1;
             this.variables = new Dictionary<string, BindVariable>();
@@ -39,7 +40,7 @@ namespace WixToolset.Core
 
                 foreach (var variable in localization.Variables)
                 {
-                    Localizer.AddWixVariable(this.variables, variable);
+                    Localizer.AddWixVariable(messaging, this.variables, variable);
                 }
 
                 foreach (KeyValuePair<string, LocalizedControl> localizedControl in localization.LocalizedControls)
@@ -86,7 +87,7 @@ namespace WixToolset.Core
         /// <param name="tableDefinitions">Collection containing TableDefinitions to use when loading the localization file.</param>
         /// <param name="suppressSchema">Suppress xml schema validation while loading.</param>
         /// <returns>Returns the loaded localization file.</returns>
-        public static Localization ParseLocalizationFile(string path)
+        public static Localization ParseLocalizationFile(IMessaging messaging, string path)
         {
             XElement root = XDocument.Load(path).Root;
             Localization localization = null;
@@ -96,23 +97,23 @@ namespace WixToolset.Core
             {
                 if (Localizer.WxlNamespace == root.Name.Namespace)
                 {
-                    localization = ParseWixLocalizationElement(root);
+                    localization = ParseWixLocalizationElement(messaging, root);
                 }
                 else // invalid or missing namespace
                 {
                     if (null == root.Name.Namespace)
                     {
-                        Messaging.Instance.OnMessage(WixErrors.InvalidWixXmlNamespace(sourceLineNumbers, Localizer.XmlElementName, Localizer.WxlNamespace.NamespaceName));
+                        messaging.Write(ErrorMessages.InvalidWixXmlNamespace(sourceLineNumbers, Localizer.XmlElementName, Localizer.WxlNamespace.NamespaceName));
                     }
                     else
                     {
-                        Messaging.Instance.OnMessage(WixErrors.InvalidWixXmlNamespace(sourceLineNumbers, Localizer.XmlElementName, root.Name.LocalName, Localizer.WxlNamespace.NamespaceName));
+                        messaging.Write(ErrorMessages.InvalidWixXmlNamespace(sourceLineNumbers, Localizer.XmlElementName, root.Name.LocalName, Localizer.WxlNamespace.NamespaceName));
                     }
                 }
             }
             else
             {
-                Messaging.Instance.OnMessage(WixErrors.InvalidDocumentElement(sourceLineNumbers, root.Name.LocalName, "localization", Localizer.XmlElementName));
+                messaging.Write(ErrorMessages.InvalidDocumentElement(sourceLineNumbers, root.Name.LocalName, "localization", Localizer.XmlElementName));
             }
 
             return localization;
@@ -123,7 +124,7 @@ namespace WixToolset.Core
         /// </summary>
         /// <param name="variables">Dictionary of variable rows.</param>
         /// <param name="wixVariableRow">Row to add to the variables dictionary.</param>
-        private static void AddWixVariable(IDictionary<string, BindVariable> variables, BindVariable wixVariableRow)
+        private static void AddWixVariable(IMessaging messaging, IDictionary<string, BindVariable> variables, BindVariable wixVariableRow)
         {
             if (!variables.TryGetValue(wixVariableRow.Id, out var existingWixVariableRow) || (existingWixVariableRow.Overridable && !wixVariableRow.Overridable))
             {
@@ -131,7 +132,7 @@ namespace WixToolset.Core
             }
             else if (!wixVariableRow.Overridable)
             {
-                Messaging.Instance.OnMessage(WixErrors.DuplicateLocalizationIdentifier(wixVariableRow.SourceLineNumbers, wixVariableRow.Id));
+                messaging.Write(ErrorMessages.DuplicateLocalizationIdentifier(wixVariableRow.SourceLineNumbers, wixVariableRow.Id));
             }
         }
 
@@ -139,7 +140,7 @@ namespace WixToolset.Core
         /// Parses the WixLocalization element.
         /// </summary>
         /// <param name="node">Element to parse.</param>
-        private static Localization ParseWixLocalizationElement(XElement node)
+        private static Localization ParseWixLocalizationElement(IMessaging messaging, XElement node)
         {
             int codepage = -1;
             string culture = null;
@@ -161,13 +162,13 @@ namespace WixToolset.Core
                             // do nothing; @Language is used for locutil which can't convert Culture to lcid
                             break;
                         default:
-                            Common.UnexpectedAttribute(sourceLineNumbers, attrib);
+                            Common.UnexpectedAttribute(messaging, sourceLineNumbers, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    Common.UnexpectedAttribute(sourceLineNumbers, attrib);
+                    Common.UnexpectedAttribute(messaging, sourceLineNumbers, attrib);
                 }
             }
 
@@ -181,32 +182,32 @@ namespace WixToolset.Core
                     switch (child.Name.LocalName)
                     {
                         case "String":
-                            Localizer.ParseString(child, variables);
+                            Localizer.ParseString(messaging, child, variables);
                             break;
 
                         case "UI":
-                            Localizer.ParseUI(child, localizedControls);
+                            Localizer.ParseUI(messaging, child, localizedControls);
                             break;
 
                         default:
-                            Messaging.Instance.OnMessage(WixErrors.UnexpectedElement(sourceLineNumbers, node.Name.ToString(), child.Name.ToString()));
+                            messaging.Write(ErrorMessages.UnexpectedElement(sourceLineNumbers, node.Name.ToString(), child.Name.ToString()));
                             break;
                     }
                 }
                 else
                 {
-                    Messaging.Instance.OnMessage(WixErrors.UnsupportedExtensionElement(sourceLineNumbers, node.Name.ToString(), child.Name.ToString()));
+                    messaging.Write(ErrorMessages.UnsupportedExtensionElement(sourceLineNumbers, node.Name.ToString(), child.Name.ToString()));
                 }
             }
 
-            return Messaging.Instance.EncounteredError ? null : new Localization(codepage, culture, variables, localizedControls);
+            return messaging.EncounteredError ? null : new Localization(codepage, culture, variables, localizedControls);
         }
 
         /// <summary>
         /// Parse a localization string into a WixVariableRow.
         /// </summary>
         /// <param name="node">Element to parse.</param>
-        private static void ParseString(XElement node, IDictionary<string, BindVariable> variables)
+        private static void ParseString(IMessaging messaging, XElement node, IDictionary<string, BindVariable> variables)
         {
             string id = null;
             bool overridable = false;
@@ -219,22 +220,22 @@ namespace WixToolset.Core
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = Common.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            id = Common.GetAttributeIdentifierValue(messaging, sourceLineNumbers, attrib);
                             break;
                         case "Overridable":
-                            overridable = YesNoType.Yes == Common.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            overridable = YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib);
                             break;
                         case "Localizable":
                             ; // do nothing
                             break;
                         default:
-                            Messaging.Instance.OnMessage(WixErrors.UnexpectedAttribute(sourceLineNumbers, attrib.Parent.Name.ToString(), attrib.Name.ToString()));
+                            messaging.Write(ErrorMessages.UnexpectedAttribute(sourceLineNumbers, attrib.Parent.Name.ToString(), attrib.Name.ToString()));
                             break;
                     }
                 }
                 else
                 {
-                    Messaging.Instance.OnMessage(WixErrors.UnsupportedExtensionAttribute(sourceLineNumbers, attrib.Parent.Name.ToString(), attrib.Name.ToString()));
+                    messaging.Write(ErrorMessages.UnsupportedExtensionAttribute(sourceLineNumbers, attrib.Parent.Name.ToString(), attrib.Name.ToString()));
                 }
             }
 
@@ -242,14 +243,14 @@ namespace WixToolset.Core
 
             if (null == id)
             {
-                Messaging.Instance.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, "String", "Id"));
+                messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, "String", "Id"));
             }
             else if (0 == id.Length)
             {
-                Messaging.Instance.OnMessage(WixErrors.IllegalIdentifier(sourceLineNumbers, "String", "Id", 0));
+                messaging.Write(ErrorMessages.IllegalIdentifier(sourceLineNumbers, "String", "Id", 0));
             }
 
-            if (!Messaging.Instance.EncounteredError)
+            if (!messaging.EncounteredError)
             {
                 var variable = new BindVariable
                 {
@@ -259,7 +260,7 @@ namespace WixToolset.Core
                     Value = value,
                 };
 
-                Localizer.AddWixVariable(variables, variable);
+                Localizer.AddWixVariable(messaging, variables, variable);
             }
         }
 
@@ -268,7 +269,7 @@ namespace WixToolset.Core
         /// </summary>
         /// <param name="node">Element to parse.</param>
         /// <param name="localizedControls">Dictionary of localized controls.</param>
-        private static void ParseUI(XElement node, IDictionary<string, LocalizedControl> localizedControls)
+        private static void ParseUI(IMessaging messaging, XElement node, IDictionary<string, LocalizedControl> localizedControls)
         {
             string dialog = null;
             string control = null;
@@ -287,49 +288,49 @@ namespace WixToolset.Core
                     switch (attrib.Name.LocalName)
                     {
                         case "Dialog":
-                            dialog = Common.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            dialog = Common.GetAttributeIdentifierValue(messaging, sourceLineNumbers, attrib);
                             break;
                         case "Control":
-                            control = Common.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            control = Common.GetAttributeIdentifierValue(messaging, sourceLineNumbers, attrib);
                             break;
                         case "X":
-                            x = Common.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
+                            x = Common.GetAttributeIntegerValue(messaging, sourceLineNumbers, attrib, 0, short.MaxValue);
                             break;
                         case "Y":
-                            y = Common.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
+                            y = Common.GetAttributeIntegerValue(messaging, sourceLineNumbers, attrib, 0, short.MaxValue);
                             break;
                         case "Width":
-                            width = Common.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
+                            width = Common.GetAttributeIntegerValue(messaging, sourceLineNumbers, attrib, 0, short.MaxValue);
                             break;
                         case "Height":
-                            height = Common.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
+                            height = Common.GetAttributeIntegerValue(messaging, sourceLineNumbers, attrib, 0, short.MaxValue);
                             break;
                         case "RightToLeft":
-                            if (YesNoType.Yes == Common.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            if (YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib))
                             {
                                 attribs |= MsiInterop.MsidbControlAttributesRTLRO;
                             }
                             break;
                         case "RightAligned":
-                            if (YesNoType.Yes == Common.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            if (YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib))
                             {
                                 attribs |= MsiInterop.MsidbControlAttributesRightAligned;
                             }
                             break;
                         case "LeftScroll":
-                            if (YesNoType.Yes == Common.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            if (YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib))
                             {
                                 attribs |= MsiInterop.MsidbControlAttributesLeftScroll;
                             }
                             break;
                         default:
-                            Common.UnexpectedAttribute(sourceLineNumbers, attrib);
+                            Common.UnexpectedAttribute(messaging, sourceLineNumbers, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    Common.UnexpectedAttribute(sourceLineNumbers, attrib);
+                    Common.UnexpectedAttribute(messaging, sourceLineNumbers, attrib);
                 }
             }
 
@@ -339,24 +340,24 @@ namespace WixToolset.Core
             {
                 if (MsiInterop.MsidbControlAttributesRTLRO == (attribs & MsiInterop.MsidbControlAttributesRTLRO))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.ToString(), "RightToLeft", "Control"));
+                    messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.ToString(), "RightToLeft", "Control"));
                 }
                 else if (MsiInterop.MsidbControlAttributesRightAligned == (attribs & MsiInterop.MsidbControlAttributesRightAligned))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.ToString(), "RightAligned", "Control"));
+                    messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.ToString(), "RightAligned", "Control"));
                 }
                 else if (MsiInterop.MsidbControlAttributesLeftScroll == (attribs & MsiInterop.MsidbControlAttributesLeftScroll))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.ToString(), "LeftScroll", "Control"));
+                    messaging.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.ToString(), "LeftScroll", "Control"));
                 }
             }
 
             if (String.IsNullOrEmpty(control) && String.IsNullOrEmpty(dialog))
             {
-                Messaging.Instance.OnMessage(WixErrors.ExpectedAttributesWithOtherAttribute(sourceLineNumbers, node.Name.ToString(), "Dialog", "Control"));
+                messaging.Write(ErrorMessages.ExpectedAttributesWithOtherAttribute(sourceLineNumbers, node.Name.ToString(), "Dialog", "Control"));
             }
 
-            if (!Messaging.Instance.EncounteredError)
+            if (!messaging.EncounteredError)
             {
                 LocalizedControl localizedControl = new LocalizedControl(dialog, control, x, y, width, height, attribs, text);
                 string key = localizedControl.GetKey();
@@ -364,11 +365,11 @@ namespace WixToolset.Core
                 {
                     if (String.IsNullOrEmpty(localizedControl.Control))
                     {
-                        Messaging.Instance.OnMessage(WixErrors.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog));
+                        messaging.Write(ErrorMessages.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog));
                     }
                     else
                     {
-                        Messaging.Instance.OnMessage(WixErrors.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog, localizedControl.Control));
+                        messaging.Write(ErrorMessages.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog, localizedControl.Control));
                     }
                 }
                 else