3 files changed, 8 insertions, 36 deletions

diff --git a/src/WixToolset.Core/Extensibility/HeatExtension.cs b/src/WixToolset.Core/Extensibility/HeatExtension.cs
index 2b4a6823..b0da75f1 100644
--- a/src/WixToolset.Core/Extensibility/HeatExtension.cs
+++ b/src/WixToolset.Core/Extensibility/HeatExtension.cs
@@ -123,13 +123,13 @@ namespace WixToolset.Core.Extensibility
                                 }
                                 else
                                 {
-                                    throw new WixException(WixErrors.InvalidExtension(assemblyName, innerE.Message));
+                                    throw new WixException(ErrorMessages.InvalidExtension(assemblyName, innerE.Message));
                                 }
                             }
                         }
                         else
                         {
-                            throw new WixException(WixErrors.InvalidExtension(assemblyName, e.Message));
+                            throw new WixException(ErrorMessages.InvalidExtension(assemblyName, e.Message));
                         }
                     }
                 }
@@ -143,7 +143,7 @@ namespace WixToolset.Core.Extensibility
                     }
                     catch (Exception e)
                     {
-                        throw new WixException(WixErrors.InvalidExtensionType(assemblyName, className, e.GetType().ToString(), e.Message));
+                        throw new WixException(ErrorMessages.InvalidExtensionType(assemblyName, className, e.GetType().ToString(), e.Message));
                     }
                 }
                 else
@@ -157,7 +157,7 @@ namespace WixToolset.Core.Extensibility
                     }
                     else
                     {
-                        throw new WixException(WixErrors.InvalidExtensionType(assemblyName, typeof(AssemblyDefaultHeatExtensionAttribute).ToString()));
+                        throw new WixException(ErrorMessages.InvalidExtensionType(assemblyName, typeof(AssemblyDefaultHeatExtensionAttribute).ToString()));
                     }
                 }
             }
@@ -168,7 +168,7 @@ namespace WixToolset.Core.Extensibility
             }
             else
             {
-                throw new WixException(WixErrors.InvalidExtensionType(extension, extensionType.ToString(), typeof(HeatExtension).ToString()));
+                throw new WixException(ErrorMessages.InvalidExtensionType(extension, extensionType.ToString(), typeof(HeatExtension).ToString()));
             }
         }
 
@@ -191,7 +191,7 @@ namespace WixToolset.Core.Extensibility
             }
             catch (Exception e)
             {
-                throw new WixException(WixErrors.InvalidExtension(assemblyName, e.Message));
+                throw new WixException(ErrorMessages.InvalidExtension(assemblyName, e.Message));
             }
 
             return extensionAssembly;
diff --git a/src/WixToolset.Core/Extensibility/IHarvesterCore.cs b/src/WixToolset.Core/Extensibility/IHarvesterCore.cs
index 9a6fd10c..a9001b46 100644
--- a/src/WixToolset.Core/Extensibility/IHarvesterCore.cs
+++ b/src/WixToolset.Core/Extensibility/IHarvesterCore.cs
@@ -2,22 +2,14 @@
 
 namespace WixToolset
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using WixToolset.Data;
-    using Wix = WixToolset.Data.Serialize;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// The WiX Toolset harvester core.
     /// </summary>
     public interface IHarvesterCore
     {
-        /// <summary>
-        /// Gets whether the harvester core encountered an error while processing.
-        /// </summary>
-        /// <value>Flag if core encountered an error during processing.</value>
-        bool EncounteredError { get; }
+        IMessaging Messaging { get; set; }
 
         /// <summary>
         /// Gets or sets the value of the extension argument passed to heat.
@@ -47,12 +39,6 @@ namespace WixToolset
         string GenerateIdentifier(string prefix, params string[] args);
 
         /// <summary>
-        /// Sends a message to the message delegate if there is one.
-        /// </summary>
-        /// <param name="mea">Message event arguments.</param>
-        void OnMessage(MessageEventArgs mea);
-
-        /// <summary>
         /// Resolves a file's path if the Wix.File.Source value starts with "SourceDir\".
         /// </summary>
         /// <param name="fileSource">The Wix.File.Source value with "SourceDir\".</param>
diff --git a/src/WixToolset.Core/Extensibility/IHeatCore.cs b/src/WixToolset.Core/Extensibility/IHeatCore.cs
index 031c8132..1365dfaf 100644
--- a/src/WixToolset.Core/Extensibility/IHeatCore.cs
+++ b/src/WixToolset.Core/Extensibility/IHeatCore.cs
@@ -2,20 +2,12 @@
 
 namespace WixToolset.Core.Extensibility
 {
-    using WixToolset.Data;
-
     /// <summary>
     /// The WiX Toolset Harvester application core.
     /// </summary>
     public interface IHeatCore
     {
         /// <summary>
-        /// Gets whether the mutator core encountered an error while processing.
-        /// </summary>
-        /// <value>Flag if core encountered an error during processing.</value>
-        bool EncounteredError { get; }
-
-        /// <summary>
         /// Gets the harvester.
         /// </summary>
         /// <value>The harvester.</value>
@@ -26,11 +18,5 @@ namespace WixToolset.Core.Extensibility
         /// </summary>
         /// <value>The mutator.</value>
         Mutator Mutator { get; }
-
-        /// <summary>
-        /// Sends a message to the message delegate if there is one.
-        /// </summary>
-        /// <param name="mea">Message event arguments.</param>
-        void OnMessage(MessageEventArgs mea);
     }
 }