Integrate simplified message handling

1 files changed, 10 insertions, 6 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
index 0c0aea1f..056f92a7 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
@@ -10,17 +10,21 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Core.Native;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Set the guids for components with generatable guids.
     /// </summary>
     internal class CalculateComponentGuids
     {
-        public CalculateComponentGuids(IntermediateSection section)
+        public CalculateComponentGuids(IMessaging messaging, IntermediateSection section)
         {
+            this.Messaging = messaging;
             this.Section = section;
         }
 
+        private IMessaging Messaging { get; }
+
         private IntermediateSection Section { get; }
 
         public void Execute()
@@ -43,7 +47,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                 if (String.IsNullOrEmpty(componentRow.KeyPath) || odbcDataSourceKeyPath)
                 {
-                    Messaging.Instance.OnMessage(WixErrors.IllegalComponentWithAutoGeneratedGuid(componentRow.SourceLineNumbers));
+                    this.Messaging.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(componentRow.SourceLineNumbers));
                     continue;
                 }
 
@@ -143,13 +147,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                 path.StartsWith(@"StartMenuFolder\programs", StringComparison.Ordinal) ||
                                 path.StartsWith(@"WindowsFolder\fonts", StringComparison.Ordinal))
                             {
-                                Messaging.Instance.OnMessage(WixErrors.IllegalPathForGeneratedComponentGuid(componentRow.SourceLineNumbers, fileRow.Component_, path));
+                                this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentRow.SourceLineNumbers, fileRow.Component_, path));
                             }
 
                             // if component has more than one file, the key path must be versioned
                             if (1 < numFilesInComponent && String.IsNullOrEmpty(fileRow.Version))
                             {
-                                Messaging.Instance.OnMessage(WixErrors.IllegalGeneratedGuidComponentUnversionedKeypath(componentRow.SourceLineNumbers));
+                                this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentUnversionedKeypath(componentRow.SourceLineNumbers));
                             }
                         }
                         else
@@ -157,13 +161,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             // not a key path, so it must be an unversioned file if component has more than one file
                             if (1 < numFilesInComponent && !String.IsNullOrEmpty(fileRow.Version))
                             {
-                                Messaging.Instance.OnMessage(WixErrors.IllegalGeneratedGuidComponentVersionedNonkeypath(componentRow.SourceLineNumbers));
+                                this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentVersionedNonkeypath(componentRow.SourceLineNumbers));
                             }
                         }
                     }
 
                     // if the rules were followed, reward with a generated guid
-                    if (!Messaging.Instance.EncounteredError)
+                    if (!this.Messaging.EncounteredError)
                     {
                         componentRow.ComponentId = Uuid.NewUuid(BindDatabaseCommand.WixComponentGuidNamespace, path).ToString("B").ToUpperInvariant();
                     }