Remove ICompilerCore, introduce IParseHelper and other small fixes

1 files changed, 3 insertions, 11 deletions

diff --git a/src/WixToolset.Extensibility/ICompilerExtension.cs b/src/WixToolset.Extensibility/ICompilerExtension.cs
index 1746a571..0aa5c9e2 100644
--- a/src/WixToolset.Extensibility/ICompilerExtension.cs
+++ b/src/WixToolset.Extensibility/ICompilerExtension.cs
@@ -5,20 +5,12 @@ namespace WixToolset.Extensibility
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Interface all compiler extensions implement.
     /// </summary>
     public interface ICompilerExtension
     {
-#if false
-        /// <summary>
-        /// Gets or sets the compiler core for the extension.
-        /// </summary>
-        /// <value>Compiler core for the extension.</value>
-        ICompilerCore Core { get; set; }
-#endif
         /// <summary>
         /// Gets the schema namespace for this extension.
         /// </summary>
@@ -36,7 +28,7 @@ namespace WixToolset.Extensibility
         /// <param name="parentElement">Parent element of attribute.</param>
         /// <param name="attribute">Attribute to process.</param>
         /// <param name="context">Extra information about the context in which this element is being parsed.</param>
-        void ParseAttribute(XElement parentElement, XAttribute attribute, IDictionary<string, string> context);
+        void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary<string, string> context);
 
         /// <summary>
         /// Processes an element for the Compiler.
@@ -44,7 +36,7 @@ namespace WixToolset.Extensibility
         /// <param name="parentElement">Parent element of element to process.</param>
         /// <param name="element">Element to process.</param>
         /// <param name="context">Extra information about the context in which this element is being parsed.</param>
-        void ParseElement(XElement parentElement, XElement element, IDictionary<string, string> context);
+        void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context);
 
         /// <summary>
         /// Processes an element for the Compiler, with the ability to supply a component keypath.
@@ -52,7 +44,7 @@ namespace WixToolset.Extensibility
         /// <param name="parentElement">Parent element of element to process.</param>
         /// <param name="element">Element to process.</param>
         /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
-        ComponentKeyPath ParsePossibleKeyPathElement(XElement parentElement, XElement element, IDictionary<string, string> context);
+        ComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context);
 
         /// <summary>
         /// Called at the end of the compilation of a source file.