3 files changed, 10 insertions, 8 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
index 1757e06f..ed3161ef 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
@@ -136,7 +136,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                     }
                     catch (FileNotFoundException)
                     {
-                        throw new WixException(WixErrors.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile));
+                        throw new WixException(ErrorMessages.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile));
                     }
                 }
             }
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 72e0c3c8..5d24d08a 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -12,11 +12,12 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Data.WindowsInstaller.Rows;
+    using WixToolset.Extensibility.Services;
     using WixToolset.Msi;
 
     internal class UnbindDatabaseCommand
     {
-        public UnbindDatabaseCommand(Messaging messaging, Database database, string databasePath, OutputType outputType, string exportBasePath, string intermediateFolder, bool isAdminImage, bool suppressDemodularization, bool skipSummaryInfo)
+        public UnbindDatabaseCommand(IMessaging messaging, Database database, string databasePath, OutputType outputType, string exportBasePath, string intermediateFolder, bool isAdminImage, bool suppressDemodularization, bool skipSummaryInfo)
         {
             this.Messaging = messaging;
             this.Database = database;
@@ -31,7 +32,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
         }
 
-        public Messaging Messaging { get; }
+        public IMessaging Messaging { get; }
 
         public Database Database { get; }
 
@@ -316,7 +317,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
                                                         if (!success)
                                                         {
-                                                            this.Messaging.OnMessage(WixWarnings.BadColumnDataIgnored(row.SourceLineNumbers, Convert.ToString(intValue, CultureInfo.InvariantCulture), tableName, row.Fields[i].Column.Name));
+                                                            this.Messaging.Write(WarningMessages.BadColumnDataIgnored(row.SourceLineNumbers, Convert.ToString(intValue, CultureInfo.InvariantCulture), tableName, row.Fields[i].Column.Name));
                                                         }
                                                         break;
                                                     case ColumnType.Object:
@@ -480,7 +481,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
                 if (!File.Exists(wixFileRow.Source))
                 {
-                    throw new WixException(WixErrors.WixFileNotFound(wixFileRow.Source));
+                    throw new WixException(ErrorMessages.WixFileNotFound(wixFileRow.Source));
                 }
 
                 wixFileTable.Rows.Add(wixFileRow);
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
index 70f751f5..2b018013 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
@@ -13,11 +13,12 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
     using WixToolset.Msi;
 
     internal class UnbindTransformCommand
     {
-        public UnbindTransformCommand(Messaging messaging, string transformFile, string exportBasePath, string intermediateFolder)
+        public UnbindTransformCommand(IMessaging messaging, string transformFile, string exportBasePath, string intermediateFolder)
         {
             this.Messaging = messaging;
             this.TransformFile = transformFile;
@@ -27,7 +28,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
         }
 
-        private Messaging Messaging { get; }
+        private IMessaging Messaging { get; }
 
         private string TransformFile { get; }
 
@@ -152,7 +153,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                         // this commonly happens when the transform was built
                         // against a database schema different from the internal
                         // table definitions
-                        throw new WixException(WixErrors.TransformSchemaMismatch());
+                        throw new WixException(ErrorMessages.TransformSchemaMismatch());
                     }
                 }