Integrate simplified message handling

1 files changed, 9 insertions, 6 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
index 49440cea..800ebac0 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
@@ -6,11 +6,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
     using WixToolset.Msi;
-    using WixToolset.Core.Native;
-    using WixToolset.Data.WindowsInstaller;
 
     internal class BindTransformCommand
     {
@@ -22,6 +23,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public Output Transform { private get; set; }
 
+        public IMessaging Messaging { private get; set; }
+
         public string OutputPath { private get; set; }
 
         public void Execute()
@@ -197,7 +200,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             if (((int)TransformFlags.ValidateUpgradeCode & transformFlags) != 0 &&
                 (String.IsNullOrEmpty(targetUpgradeCode) || String.IsNullOrEmpty(updatedUpgradeCode)))
             {
-                Messaging.Instance.OnMessage(WixErrors.BothUpgradeCodesRequired());
+                this.Messaging.Write(ErrorMessages.BothUpgradeCodesRequired());
             }
 
             string emptyFile = null;
@@ -276,7 +279,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             {
                                 if (RowOperation.Add == fileRow.Operation)
                                 {
-                                    Messaging.Instance.OnMessage(WixErrors.InvalidAddedFileRowWithoutSequence(fileRow.SourceLineNumbers, (string)fileRow[0]));
+                                    this.Messaging.Write(ErrorMessages.InvalidAddedFileRowWithoutSequence(fileRow.SourceLineNumbers, (string)fileRow[0]));
                                     break;
                                 }
 
@@ -384,7 +387,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             //}
 
             // Any errors encountered up to this point can cause errors during generation.
-            if (Messaging.Instance.EncounteredError)
+            if (this.Messaging.EncounteredError)
             {
                 return;
             }
@@ -419,7 +422,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         }
                         else
                         {
-                            Messaging.Instance.OnMessage(WixErrors.NoDifferencesInTransform(this.Transform.SourceLineNumbers));
+                            this.Messaging.Write(ErrorMessages.NoDifferencesInTransform(this.Transform.SourceLineNumbers));
                         }
                     }
                 }