4 files changed, 44 insertions, 54 deletions

diff --git a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
index 00613ca1..daf3e878 100644
--- a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
+++ b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
@@ -6,14 +6,18 @@ namespace WixToolset.Core.Link
     using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
-    internal class FindEntrySectionAndLoadSymbolsCommand : ICommand
+    internal class FindEntrySectionAndLoadSymbolsCommand
     {
-        public FindEntrySectionAndLoadSymbolsCommand(IEnumerable<IntermediateSection> sections)
+        public FindEntrySectionAndLoadSymbolsCommand(IMessaging messaging, IEnumerable<IntermediateSection> sections)
         {
+            this.Messaging = messaging;
             this.Sections = sections;
         }
 
+        private IMessaging Messaging { get; }
+
         private IEnumerable<IntermediateSection> Sections { get; }
 
         /// <summary>
@@ -55,7 +59,7 @@ namespace WixToolset.Core.Link
                     //if (SectionType.Unknown != expectedEntrySectionType && section.Type != expectedEntrySectionType)
                     //{
                     //    string outputExtension = Output.GetExtension(this.ExpectedOutputType);
-                    //    Messaging.Instance.OnMessage(WixWarnings.UnexpectedEntrySection(section.SourceLineNumbers, section.Type.ToString(), expectedEntrySectionType.ToString(), outputExtension));
+                    //    this.Messaging.Write(WixWarnings.UnexpectedEntrySection(section.SourceLineNumbers, section.Type.ToString(), expectedEntrySectionType.ToString(), outputExtension));
                     //}
 
                     if (null == this.EntrySection)
@@ -64,8 +68,8 @@ namespace WixToolset.Core.Link
                     }
                     else
                     {
-                        Messaging.Instance.OnMessage(WixErrors.MultipleEntrySections(this.EntrySection.Tuples.FirstOrDefault()?.SourceLineNumbers, this.EntrySection.Id, section.Id));
-                        Messaging.Instance.OnMessage(WixErrors.MultipleEntrySections2(section.Tuples.FirstOrDefault()?.SourceLineNumbers));
+                        this.Messaging.Write(ErrorMessages.MultipleEntrySections(this.EntrySection.Tuples.FirstOrDefault()?.SourceLineNumbers, this.EntrySection.Id, section.Id));
+                        this.Messaging.Write(ErrorMessages.MultipleEntrySections2(section.Tuples.FirstOrDefault()?.SourceLineNumbers));
                     }
                 }
 
diff --git a/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs b/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs
index ac0dd7ec..23fac864 100644
--- a/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs
+++ b/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs
@@ -5,15 +5,19 @@ namespace WixToolset.Link
     using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     public class ReportConflictingSymbolsCommand
     {
-        public ReportConflictingSymbolsCommand(IEnumerable<Symbol> possibleConflicts, IEnumerable<IntermediateSection> resolvedSections)
+        public ReportConflictingSymbolsCommand(IMessaging messaging, IEnumerable<Symbol> possibleConflicts, IEnumerable<IntermediateSection> resolvedSections)
         {
+            this.Messaging = messaging;
             this.PossibleConflicts = possibleConflicts;
             this.ResolvedSections = resolvedSections;
         }
 
+        private IMessaging Messaging { get; }
+
         private  IEnumerable<Symbol> PossibleConflicts { get; }
 
         private IEnumerable<IntermediateSection> ResolvedSections { get; }
@@ -37,11 +41,11 @@ namespace WixToolset.Link
 
                     if (actuallyReferencedDuplicateSymbols.Any())
                     {
-                        Messaging.Instance.OnMessage(WixErrors.DuplicateSymbol(referencedDuplicateSymbol.Row.SourceLineNumbers, referencedDuplicateSymbol.Name));
+                        this.Messaging.Write(ErrorMessages.DuplicateSymbol(referencedDuplicateSymbol.Row.SourceLineNumbers, referencedDuplicateSymbol.Name));
 
                         foreach (Symbol duplicate in actuallyReferencedDuplicateSymbols)
                         {
-                            Messaging.Instance.OnMessage(WixErrors.DuplicateSymbol2(duplicate.Row.SourceLineNumbers));
+                            this.Messaging.Write(ErrorMessages.DuplicateSymbol2(duplicate.Row.SourceLineNumbers));
                         }
                     }
                 }
diff --git a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
index 266871bd..c05464e9 100644
--- a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
+++ b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
@@ -7,19 +7,21 @@ namespace WixToolset.Link
     using System.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Resolves all the simple references in a section.
     /// </summary>
-    internal class ResolveReferencesCommand : ICommand
+    internal class ResolveReferencesCommand
     {
         private IntermediateSection entrySection;
         private IDictionary<string, Symbol> symbols;
         private HashSet<Symbol> referencedSymbols;
         private HashSet<IntermediateSection> resolvedSections;
 
-        public ResolveReferencesCommand(IntermediateSection entrySection, IDictionary<string, Symbol> symbols)
+        public ResolveReferencesCommand(IMessaging messaging, IntermediateSection entrySection, IDictionary<string, Symbol> symbols)
         {
+            this.Messaging = messaging;
             this.entrySection = entrySection;
             this.symbols = symbols;
         }
@@ -30,6 +32,8 @@ namespace WixToolset.Link
 
         public IEnumerable<IntermediateSection> ResolvedSections { get { return this.resolvedSections; } }
 
+        private IMessaging Messaging { get; }
+
         /// <summary>
         /// Resolves all the simple references in a section.
         /// </summary>
@@ -69,14 +73,14 @@ namespace WixToolset.Link
 
                 if (!this.symbols.TryGetValue(wixSimpleReferenceRow.SymbolicName, out var symbol))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName));
+                    this.Messaging.Write(ErrorMessages.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName));
                 }
                 else // see if the symbol (and any of its duplicates) are appropriately accessible.
                 {
                     IList<Symbol> accessible = DetermineAccessibleSymbols(section, symbol);
                     if (!accessible.Any())
                     {
-                        Messaging.Instance.OnMessage(WixErrors.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName, symbol.Access));
+                        this.Messaging.Write(ErrorMessages.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName, symbol.Access));
                     }
                     else if (1 == accessible.Count)
                     {
@@ -95,16 +99,16 @@ namespace WixToolset.Link
 
                         if (String.IsNullOrEmpty(referencingSourceLineNumber))
                         {
-                            Messaging.Instance.OnMessage(WixErrors.DuplicateSymbol(accessibleSymbol.Row.SourceLineNumbers, accessibleSymbol.Name));
+                            this.Messaging.Write(ErrorMessages.DuplicateSymbol(accessibleSymbol.Row.SourceLineNumbers, accessibleSymbol.Name));
                         }
                         else
                         {
-                            Messaging.Instance.OnMessage(WixErrors.DuplicateSymbol(accessibleSymbol.Row.SourceLineNumbers, accessibleSymbol.Name, referencingSourceLineNumber));
+                            this.Messaging.Write(ErrorMessages.DuplicateSymbol(accessibleSymbol.Row.SourceLineNumbers, accessibleSymbol.Name, referencingSourceLineNumber));
                         }
 
                         foreach (Symbol accessibleDuplicate in accessible.Skip(1))
                         {
-                            Messaging.Instance.OnMessage(WixErrors.DuplicateSymbol2(accessibleDuplicate.Row.SourceLineNumbers));
+                            this.Messaging.Write(ErrorMessages.DuplicateSymbol2(accessibleDuplicate.Row.SourceLineNumbers));
                         }
                     }
                 }
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index f15ebc75..50c4d8d2 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -11,13 +11,14 @@ namespace WixToolset.Core.Link
     using System.Text;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Grouping and Ordering class of the WiX toolset.
     /// </summary>
-    internal sealed class WixGroupingOrdering : IMessageHandler
+    internal sealed class WixGroupingOrdering
     {
-        private IMessageHandler messageHandler;
+        private IMessaging messageHandler;
         private List<string> groupTypes;
         private List<string> itemTypes;
         private ItemCollection items;
@@ -32,7 +33,7 @@ namespace WixToolset.Core.Link
         /// <param name="messageHandler">Handler for any error messages.</param>
         /// <param name="groupTypes">Group types to include.</param>
         /// <param name="itemTypes">Item types to include.</param>
-        public WixGroupingOrdering(IntermediateSection entrySections, IMessageHandler messageHandler)
+        public WixGroupingOrdering(IntermediateSection entrySections, IMessaging messageHandler)
         {
             this.EntrySection = entrySections;
             this.messageHandler = messageHandler;
@@ -59,29 +60,6 @@ namespace WixToolset.Core.Link
         }
 
         /// <summary>
-        /// Sends a message to the message handler if there is one.
-        /// </summary>
-        /// <param name="mea">Message event arguments.</param>
-        public void OnMessage(MessageEventArgs e)
-        {
-            WixErrorEventArgs errorEventArgs = e as WixErrorEventArgs;
-
-            if (null != errorEventArgs || MessageLevel.Error == e.Level)
-            {
-                this.encounteredError = true;
-            }
-
-            if (null != this.messageHandler)
-            {
-                this.messageHandler.OnMessage(e);
-            }
-            else if (null != errorEventArgs)
-            {
-                throw new WixException(errorEventArgs);
-            }
-        }
-
-        /// <summary>
         /// Finds all nested items under a parent group and creates new WixGroup data for them.
         /// </summary>
         /// <param name="parentType">The group type for the parent group to flatten.</param>
@@ -156,7 +134,7 @@ namespace WixToolset.Core.Link
             Item parentItem;
             if (!this.items.TryGetValue(parentType, parentId, out parentItem))
             {
-                this.OnMessage(WixErrors.IdentifierNotFound(parentType, parentId));
+                this.messageHandler.Write(ErrorMessages.IdentifierNotFound(parentType, parentId));
                 return;
             }
 
@@ -257,7 +235,7 @@ namespace WixToolset.Core.Link
             //if (null == wixGroupTable || 0 == wixGroupTable.Rows.Count)
             //{
             //    // TODO: Change message name to make it *not* Bundle specific?
-            //    this.OnMessage(WixErrors.MissingBundleInformation("WixGroup"));
+            //    this.Write(WixErrors.MissingBundleInformation("WixGroup"));
             //}
 
             // Collect all of the groups
@@ -326,7 +304,7 @@ namespace WixToolset.Core.Link
                 if (this.FindCircularGroupReference(item, item, itemsSeen, out circularReference))
                 {
                     itemsInKnownLoops.Add(itemsSeen);
-                    this.OnMessage(WixErrors.ReferenceLoopDetected(item.Row.SourceLineNumbers, circularReference));
+                    this.messageHandler.Write(ErrorMessages.ReferenceLoopDetected(item.Row.SourceLineNumbers, circularReference));
                 }
             }
         }
@@ -398,12 +376,12 @@ namespace WixToolset.Core.Link
 
                 if (!this.items.TryGetValue(rowItemType, rowItemName, out var item))
                 {
-                    this.OnMessage(WixErrors.IdentifierNotFound(rowItemType, rowItemName));
+                    this.messageHandler.Write(ErrorMessages.IdentifierNotFound(rowItemType, rowItemName));
                 }
 
                 if (!this.items.TryGetValue(rowDependsOnType, rowDependsOnName, out var dependsOn))
                 {
-                    this.OnMessage(WixErrors.IdentifierNotFound(rowDependsOnType, rowDependsOnName));
+                    this.messageHandler.Write(ErrorMessages.IdentifierNotFound(rowDependsOnType, rowDependsOnName));
                 }
 
                 if (null == item || null == dependsOn)
@@ -411,7 +389,7 @@ namespace WixToolset.Core.Link
                     continue;
                 }
 
-                item.AddAfter(dependsOn, this);
+                item.AddAfter(dependsOn, this.messageHandler);
             }
         }
 
@@ -426,12 +404,12 @@ namespace WixToolset.Core.Link
             // ordering.
             foreach (Item item in this.items)
             {
-                item.PropagateAfterToChildItems(this);
+                item.PropagateAfterToChildItems(this.messageHandler);
             }
 
             foreach (Item item in this.items)
             {
-                item.FlattenAfters(this);
+                item.FlattenAfters(this.messageHandler);
             }
         }
 
@@ -595,7 +573,7 @@ namespace WixToolset.Core.Link
             /// </summary>
             /// <param name="items">List of items to add.</param>
             /// <param name="messageHandler">Message handler in case a circular ordering reference is found.</param>
-            public void AddAfter(ItemCollection items, IMessageHandler messageHandler)
+            public void AddAfter(ItemCollection items, IMessaging messageHandler)
             {
                 foreach (Item item in items)
                 {
@@ -608,7 +586,7 @@ namespace WixToolset.Core.Link
             /// </summary>
             /// <param name="item">Items to add.</param>
             /// <param name="messageHandler">Message handler in case a circular ordering reference is found.</param>
-            public void AddAfter(Item after, IMessageHandler messageHandler)
+            public void AddAfter(Item after, IMessaging messageHandler)
             {
                 if (this.beforeItems.Contains(after))
                 {
@@ -617,7 +595,7 @@ namespace WixToolset.Core.Link
                     // have lost some distinction between authored and propagated ordering.
                     string circularReference = String.Format(CultureInfo.InvariantCulture, "{0}:{1} -> {2}:{3} -> {0}:{1}",
                         this.Type, this.Id, after.Type, after.Id);
-                    messageHandler.OnMessage(WixErrors.OrderingReferenceLoopDetected(after.Row.SourceLineNumbers, circularReference));
+                    messageHandler.Write(ErrorMessages.OrderingReferenceLoopDetected(after.Row.SourceLineNumbers, circularReference));
                     return;
                 }
 
@@ -632,7 +610,7 @@ namespace WixToolset.Core.Link
             /// <remarks>Because items don't know about their parent groups (and can, in fact, be in more
             /// than one group at a time), we need to propagate the 'afters' from each parent item to its children
             /// before we attempt to flatten the ordering.</remarks>
-            public void PropagateAfterToChildItems(IMessageHandler messageHandler)
+            public void PropagateAfterToChildItems(IMessaging messageHandler)
             {
                 if (this.ShouldItemPropagateChildOrdering())
                 {
@@ -647,7 +625,7 @@ namespace WixToolset.Core.Link
             /// Flattens the ordering dependency for this item.
             /// </summary>
             /// <param name="messageHandler">Message handler in case a circular ordering reference is found.</param>
-            public void FlattenAfters(IMessageHandler messageHandler)
+            public void FlattenAfters(IMessaging messageHandler)
             {
                 if (this.flattenedAfterItems)
                 {