Integrate simplified message handling

1 files changed, 7 insertions, 3 deletions

diff --git a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
index 4585b71a..3ded9a87 100644
--- a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.Bind
     using System.Globalization;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Resolves the fields which had variables that needed to be resolved after the file information
@@ -19,12 +20,15 @@ namespace WixToolset.Core.Bind
         /// </summary>
         /// <param name="delayedFields">The fields which had resolution delayed.</param>
         /// <param name="variableCache">The file information to use when resolving variables.</param>
-        public ResolveDelayedFieldsCommand(IEnumerable<IDelayedField> delayedFields, Dictionary<string, string> variableCache)
+        public ResolveDelayedFieldsCommand(IMessaging messaging, IEnumerable<IDelayedField> delayedFields, Dictionary<string, string> variableCache)
         {
+            this.Messaging = messaging;
             this.DelayedFields = delayedFields;
             this.VariableCache = variableCache;
         }
 
+        private IMessaging Messaging { get; }
+
         private IEnumerable<IDelayedField> DelayedFields { get;}
 
         private IDictionary<string, string> VariableCache { get; }
@@ -58,7 +62,7 @@ namespace WixToolset.Core.Bind
                 }
                 catch (WixException we)
                 {
-                    Messaging.Instance.OnMessage(we.Error);
+                    this.Messaging.Write(we.Error);
                     continue;
                 }
             }
@@ -103,7 +107,7 @@ namespace WixToolset.Core.Bind
                 }
                 catch (WixException we)
                 {
-                    Messaging.Instance.OnMessage(we.Error);
+                    this.Messaging.Write(we.Error);
                 }
             }
         }