Update to latest changes from Core and send build notifications to Slack

1 files changed, 204 insertions, 265 deletions

diff --git a/src/wixext/VSCompiler.cs b/src/wixext/VSCompiler.cs
index cf6226dd..8c01cb5b 100644
--- a/src/wixext/VSCompiler.cs
+++ b/src/wixext/VSCompiler.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Extensions
+namespace WixToolset.VisualStudio
 {
     using System;
     using System.Collections.Generic;
@@ -11,7 +11,7 @@ namespace WixToolset.Extensions
     /// <summary>
     /// The compiler for the WiX Toolset Visual Studio Extension.
     /// </summary>
-    public sealed class VSCompiler : CompilerExtension
+    public sealed class VSCompiler : BaseCompilerExtension
     {
         internal const int MsidbCustomActionTypeExe = 0x00000002;  // Target = command line args
         internal const int MsidbCustomActionTypeProperty = 0x00000030;  // Source = full path to executable
@@ -20,22 +20,9 @@ namespace WixToolset.Extensions
         internal const int MsidbCustomActionTypeInScript = 0x00000400;  // queue for execution within script
         internal const int MsidbCustomActionTypeNoImpersonate = 0x00000800;  // queue for not impersonating
 
-        /// <summary>
-        /// Instantiate a new HelpCompiler.
-        /// </summary>
-        public VSCompiler()
-        {
-            this.Namespace = "http://wixtoolset.org/schemas/v4/wxs/vs";
-        }
+        public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/vs";
 
-        /// <summary>
-        /// Processes an element for the Compiler.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
-        /// <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>
-        public override void ParseElement(XElement parentElement, XElement element, IDictionary<string, string> context)
+        public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
         {
             switch (parentElement.Name.LocalName)
             {
@@ -43,10 +30,10 @@ namespace WixToolset.Extensions
                     switch (element.Name.LocalName)
                     {
                         case "VsixPackage":
-                            this.ParseVsixPackageElement(element, context["ComponentId"], null);
+                            this.ParseVsixPackageElement(intermediate, section, element, context["ComponentId"], null);
                             break;
                         default:
-                            this.Core.UnexpectedElement(parentElement, element);
+                            this.ParseHelper.UnexpectedElement(parentElement, element);
                             break;
                     }
                     break;
@@ -54,16 +41,16 @@ namespace WixToolset.Extensions
                     switch (element.Name.LocalName)
                     {
                         case "HelpCollection":
-                            this.ParseHelpCollectionElement(element, context["FileId"]);
+                            this.ParseHelpCollectionElement(intermediate, section, element, context["FileId"]);
                             break;
                         case "HelpFile":
-                            this.ParseHelpFileElement(element, context["FileId"]);
+                            this.ParseHelpFileElement(intermediate, section, element, context["FileId"]);
                             break;
                         case "VsixPackage":
-                            this.ParseVsixPackageElement(element, context["ComponentId"], context["FileId"]);
+                            this.ParseVsixPackageElement(intermediate, section, element, context["ComponentId"], context["FileId"]);
                             break;
                         default:
-                            this.Core.UnexpectedElement(parentElement, element);
+                            this.ParseHelper.UnexpectedElement(parentElement, element);
                             break;
                     }
                     break;
@@ -73,186 +60,171 @@ namespace WixToolset.Extensions
                     switch (element.Name.LocalName)
                     {
                         case "HelpCollectionRef":
-                            this.ParseHelpCollectionRefElement(element);
+                            this.ParseHelpCollectionRefElement(intermediate, section, element);
                             break;
                         case "HelpFilter":
-                            this.ParseHelpFilterElement(element);
+                            this.ParseHelpFilterElement(intermediate, section, element);
                             break;
                         default:
-                            this.Core.UnexpectedElement(parentElement, element);
+                            this.ParseHelper.UnexpectedElement(parentElement, element);
                             break;
                     }
                     break;
                 default:
-                    this.Core.UnexpectedElement(parentElement, element);
+                    this.ParseHelper.UnexpectedElement(parentElement, element);
                     break;
             }
         }
 
-        /// <summary>
-        /// Parses a HelpCollectionRef element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        private void ParseHelpCollectionRefElement(XElement node)
+        private void ParseHelpCollectionRefElement(Intermediate intermediate, IntermediateSection section, XElement element)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "HelpNamespace", id);
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "HelpNamespace", id.Id);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (null == id)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
 
-            foreach (XElement child in node.Elements())
+            foreach (XElement child in element.Elements())
             {
                 if (this.Namespace == child.Name.Namespace)
                 {
-                    SourceLineNumber childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
+                    SourceLineNumber childSourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(child);
                     switch (child.Name.LocalName)
                     {
                         case "HelpFileRef":
-                            this.ParseHelpFileRefElement(child, id);
+                            this.ParseHelpFileRefElement(intermediate, section, child, id);
                             break;
                         default:
-                            this.Core.UnexpectedElement(node, child);
+                            this.ParseHelper.UnexpectedElement(element, child);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionElement(node, child);
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child);
                 }
             }
         }
 
-        /// <summary>
-        /// Parses a HelpCollection element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        /// <param name="fileId">Identifier of the parent File element.</param>
-        private void ParseHelpCollectionElement(XElement node, string fileId)
+        private void ParseHelpCollectionElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
             string description = null;
             string name = null;
             YesNoType suppressCAs = YesNoType.No;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
                             break;
                         case "Description":
-                            description = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         case "Name":
-                            name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         case "SuppressCustomActions":
-                            suppressCAs = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (null == id)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
 
             if (null == description)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Description"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Description"));
             }
 
             if (null == name)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name"));
             }
 
-            foreach (XElement child in node.Elements())
+            foreach (XElement child in element.Elements())
             {
                 if (this.Namespace == child.Name.Namespace)
                 {
                     switch (child.Name.LocalName)
                     {
                         case "HelpFileRef":
-                            this.ParseHelpFileRefElement(child, id);
+                            this.ParseHelpFileRefElement(intermediate, section, child, id);
                             break;
                         case "HelpFilterRef":
-                            this.ParseHelpFilterRefElement(child, id);
+                            this.ParseHelpFilterRefElement(intermediate, section, child, id);
                             break;
                         case "PlugCollectionInto":
-                            this.ParsePlugCollectionIntoElement(child, id);
+                            this.ParsePlugCollectionIntoElement(intermediate, section, child, id);
                             break;
                         default:
-                            this.Core.UnexpectedElement(node, child);
+                            this.ParseHelper.UnexpectedElement(element, child);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionElement(node, child);
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, element, child);
                 }
             }
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
-                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpNamespace");
-                row[0] = id;
-                row[1] = name;
-                row[2] = fileId;
-                row[3] = description;
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpNamespace", id);
+                row.Set(1, name);
+                row.Set(2, fileId);
+                row.Set(3, description);
 
                 if (YesNoType.No == suppressCAs)
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
                 }
             }
         }
 
-        /// <summary>
-        /// Parses a HelpFile element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        /// <param name="fileId">Identifier of the parent file element.</param>
-        private void ParseHelpFileElement(XElement node, string fileId)
+        private void ParseHelpFileElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
             string name = null;
             int language = CompilerConstants.IntegerNotSet;
             string hxi = null;
@@ -261,255 +233,232 @@ namespace WixToolset.Extensions
             string samples = null;
             YesNoType suppressCAs = YesNoType.No;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
                             break;
                         case "AttributeIndex":
-                            hxr = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", hxr);
+                            hxr = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "File", hxr);
                             break;
                         case "Index":
-                            hxi = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", hxi);
+                            hxi = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "File", hxi);
                             break;
                         case "Language":
-                            language = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
+                            language = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
                             break;
                         case "Name":
-                            name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         case "SampleLocation":
-                            samples = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", samples);
+                            samples = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "File", samples);
                             break;
                         case "Search":
-                            hxq = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", hxq);
+                            hxq = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "File", hxq);
                             break;
                         case "SuppressCustomActions":
-                            suppressCAs = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (null == id)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
 
             if (null == name)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name"));
             }
 
-            //uninstall will always fail silently, leaving file registered, if Language is not set
+            // Uninstall will always fail silently, leaving file registered, if Language is not set
             if (CompilerConstants.IntegerNotSet == language)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Language"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Language"));
             }
 
-            this.Core.ParseForExtensionElements(node);
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
-                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFile");
-                row[0] = id;
-                row[1] = name;
-                row[2] = language;
-                row[3] = fileId;
-                row[4] = hxi;
-                row[5] = hxq;
-                row[6] = hxr;
-                row[7] = samples;
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpFile", id);
+                row.Set(1, name);
+                row.Set(2, language);
+                row.Set(3, fileId);
+                row.Set(4, hxi);
+                row.Set(5, hxq);
+                row.Set(6, hxr);
+                row.Set(7, samples);
 
                 if (YesNoType.No == suppressCAs)
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
                 }
             }
         }
 
-        /// <summary>
-        /// Parses a HelpFileRef element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        /// <param name="collectionId">Identifier of the parent help collection.</param>
-        private void ParseHelpFileRefElement(XElement node, string collectionId)
+        private void ParseHelpFileRefElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier collectionId)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "HelpFile", id);
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "HelpFile", id.Id);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (null == id)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
 
-            this.Core.ParseForExtensionElements(node);
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
-                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFileToNamespace");
-                row[0] = id;
-                row[1] = collectionId;
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpFileToNamespace", id);
+                row.Set(1, collectionId);
             }
         }
 
-        /// <summary>
-        /// Parses a HelpFilter element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        private void ParseHelpFilterElement(XElement node)
+        private void ParseHelpFilterElement(Intermediate intermediate, IntermediateSection section, XElement element)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
             string filterDefinition = null;
             string name = null;
             YesNoType suppressCAs = YesNoType.No;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
                             break;
                         case "FilterDefinition":
-                            filterDefinition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            filterDefinition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         case "Name":
-                            name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         case "SuppressCustomActions":
-                            suppressCAs = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (null == id)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
 
             if (null == name)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name"));
             }
 
-            this.Core.ParseForExtensionElements(node);
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
-                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFilter");
-                row[0] = id;
-                row[1] = name;
-                row[2] = filterDefinition;
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpFilter", id);
+                row.Set(1, name);
+                row.Set(2, filterDefinition);
 
                 if (YesNoType.No == suppressCAs)
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
                 }
             }
         }
 
-        /// <summary>
-        /// Parses a HelpFilterRef element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        /// <param name="collectionId">Identifier of the parent help collection.</param>
-        private void ParseHelpFilterRefElement(XElement node, string collectionId)
+        private void ParseHelpFilterRefElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier collectionId)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "HelpFilter", id);
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "HelpFilter", id.Id);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (null == id)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
 
-            this.Core.ParseForExtensionElements(node);
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
-                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFilterToNamespace");
-                row[0] = id;
-                row[1] = collectionId;
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpFilterToNamespace", id);
+                row.Set(1, collectionId.Id);
             }
         }
 
-        /// <summary>
-        /// Parses a PlugCollectionInto element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        /// <param name="parentId">Identifier of the parent help collection.</param>
-        private void ParsePlugCollectionIntoElement(XElement node, string parentId)
+        private void ParsePlugCollectionIntoElement(Intermediate intermediate, IntermediateSection section, XElement element, Identifier parentId)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
             string hxa = null;
             string hxt = null;
             string hxtParent = null;
@@ -519,38 +468,38 @@ namespace WixToolset.Extensions
             bool pluginVS05 = false;
             bool pluginVS08 = false;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
                     switch (attrib.Name.LocalName)
                     {
                         case "Attributes":
-                            hxa = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            hxa = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         case "TableOfContents":
-                            hxt = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            hxt = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         case "TargetCollection":
-                            namespaceParent = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            namespaceParent = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         case "TargetTableOfContents":
-                            hxtParent = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            hxtParent = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         case "TargetFeature":
-                            feature = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            feature = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         case "SuppressExternalNamespaces":
-                            suppressExternalNamespaces = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            suppressExternalNamespaces = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
@@ -559,35 +508,33 @@ namespace WixToolset.Extensions
 
             if (null == namespaceParent)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TargetCollection"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "TargetCollection"));
             }
 
             if (null == feature && (pluginVS05 || pluginVS08) && YesNoType.No == suppressExternalNamespaces)
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TargetFeature"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "TargetFeature"));
             }
 
-            this.Core.ParseForExtensionElements(node);
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
-                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpPlugin");
-                row[0] = parentId;
-                row[1] = namespaceParent;
-                row[2] = hxt;
-                row[3] = hxa;
-                row[4] = hxtParent;
+                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpPlugin", parentId);
+                row.Set(1, namespaceParent);
+                row.Set(2, hxt);
+                row.Set(3, hxa);
+                row.Set(4, hxtParent);
 
                 if (pluginVS05)
                 {
                     if (YesNoType.No == suppressExternalNamespaces)
                     {
                         // Bring in the help 2 base namespace components for VS 2005
-                        this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
+                        this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
                             ComplexReferenceChildType.ComponentGroup, "Help2_VS2005_Namespace_Components", false);
                         // Reference CustomAction since nothing will happen without it
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction",
-                            "CA_HxMerge_VSIPCC_VSCC");
+                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "CA_HxMerge_VSIPCC_VSCC");
                     }
                 }
                 else if (pluginVS08)
@@ -595,31 +542,23 @@ namespace WixToolset.Extensions
                     if (YesNoType.No == suppressExternalNamespaces)
                     {
                         // Bring in the help 2 base namespace components for VS 2008
-                        this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
+                        this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
                             ComplexReferenceChildType.ComponentGroup, "Help2_VS2008_Namespace_Components", false);
                         // Reference CustomAction since nothing will happen without it
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction",
-                            "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC");
+                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC");
                     }
                 }
                 else
                 {
                     // Reference the parent namespace to enforce the foreign key relationship
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "HelpNamespace",
-                        namespaceParent);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "HelpNamespace", namespaceParent);
                 }
             }
         }
 
-        /// <summary>
-        /// Parses a VsixPackage element.
-        /// </summary>
-        /// <param name="node">Element to process.</param>
-        /// <param name="componentId">Identifier of the parent Component element.</param>
-        /// <param name="fileId">Identifier of the parent File element.</param>
-        private void ParseVsixPackageElement(XElement node, string componentId, string fileId)
+        private void ParseVsixPackageElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId)
         {
-            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
             string propertyId = "VS_VSIX_INSTALLER_PATH";
             string packageId = null;
             YesNoType permanent = YesNoType.NotSet;
@@ -627,7 +566,7 @@ namespace WixToolset.Extensions
             string targetVersion = null;
             YesNoType vital = YesNoType.NotSet;
 
-            foreach (XAttribute attrib in node.Attributes())
+            foreach (XAttribute attrib in element.Attributes())
             {
                 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
                 {
@@ -636,21 +575,21 @@ namespace WixToolset.Extensions
                         case "File":
                             if (String.IsNullOrEmpty(fileId))
                             {
-                                fileId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                                fileId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             }
                             else
                             {
-                                this.Core.OnMessage(WixErrors.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, "File", "File"));
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, "File", "File"));
                             }
                             break;
                         case "PackageId":
-                            packageId = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            packageId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         case "Permanent":
-                            permanent = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            permanent = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
                         case "Target":
-                            target = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            target = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             switch (target.ToLowerInvariant())
                             {
                                 case "integrated":
@@ -681,53 +620,53 @@ namespace WixToolset.Extensions
                             }
                             break;
                         case "TargetVersion":
-                            targetVersion = this.Core.GetAttributeVersionValue(sourceLineNumbers, attrib);
+                            targetVersion = this.ParseHelper.GetAttributeVersionValue(sourceLineNumbers, attrib);
                             break;
                         case "Vital":
-                            vital = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            vital = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             break;
                         case "VsixInstallerPathProperty":
-                            propertyId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            propertyId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
                         default:
-                            this.Core.UnexpectedAttribute(node, attrib);
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
                     }
                 }
                 else
                 {
-                    this.Core.ParseExtensionAttribute(node, attrib);
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
                 }
             }
 
             if (String.IsNullOrEmpty(fileId))
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "File"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "File"));
             }
 
             if (String.IsNullOrEmpty(packageId))
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PackageId"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "PackageId"));
             }
 
             if (!String.IsNullOrEmpty(target) && String.IsNullOrEmpty(targetVersion))
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TargetVersion", "Target"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "TargetVersion", "Target"));
             }
             else if (String.IsNullOrEmpty(target) && !String.IsNullOrEmpty(targetVersion))
             {
-                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Target", "TargetVersion"));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Target", "TargetVersion"));
             }
 
-            this.Core.ParseForExtensionElements(node);
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            if (!this.Core.EncounteredError)
+            if (!this.Messaging.EncounteredError)
             {
                 // Ensure there is a reference to the AppSearch Property that will find the VsixInstaller.exe.
-                this.Core.CreateSimpleReference(sourceLineNumbers, "Property", propertyId);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Property", propertyId);
 
                 // Ensure there is a reference to the package file (even if we are a child under it).
-                this.Core.CreateSimpleReference(sourceLineNumbers, "File", fileId);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "File", fileId);
 
                 string cmdlinePrefix = "/q ";
 
@@ -746,8 +685,8 @@ namespace WixToolset.Extensions
                 }
                 else // the package is vital so ensure there is a rollback action scheduled.
                 {
-                    Identifier rollbackNamePerUser = this.Core.CreateIdentifier("vru", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
-                    Identifier rollbackNamePerMachine = this.Core.CreateIdentifier("vrm", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
+                    Identifier rollbackNamePerUser = this.ParseHelper.CreateIdentifier("vru", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
+                    Identifier rollbackNamePerMachine = this.ParseHelper.CreateIdentifier("vrm", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
                     string rollbackCmdLinePerUser = String.Concat(cmdlinePrefix, " /u:\"", packageId, "\"");
                     string rollbackCmdLinePerMachine = String.Concat(rollbackCmdLinePerUser, " /admin");
                     int rollbackExtraBitsPerUser = VSCompiler.MsidbCustomActionTypeContinue | VSCompiler.MsidbCustomActionTypeRollback | VSCompiler.MsidbCustomActionTypeInScript;
@@ -755,27 +694,27 @@ namespace WixToolset.Extensions
                     string rollbackConditionPerUser = String.Format("NOT ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
                     string rollbackConditionPerMachine = String.Format("ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
 
-                    this.SchedulePropertyExeAction(sourceLineNumbers, rollbackNamePerUser, propertyId, rollbackCmdLinePerUser, rollbackExtraBitsPerUser, rollbackConditionPerUser, null, installAfter);
-                    this.SchedulePropertyExeAction(sourceLineNumbers, rollbackNamePerMachine, propertyId, rollbackCmdLinePerMachine, rollbackExtraBitsPerMachine, rollbackConditionPerMachine, null, rollbackNamePerUser.Id);
+                    this.SchedulePropertyExeAction(section, sourceLineNumbers, rollbackNamePerUser, propertyId, rollbackCmdLinePerUser, rollbackExtraBitsPerUser, rollbackConditionPerUser, null, installAfter);
+                    this.SchedulePropertyExeAction(section, sourceLineNumbers, rollbackNamePerMachine, propertyId, rollbackCmdLinePerMachine, rollbackExtraBitsPerMachine, rollbackConditionPerMachine, null, rollbackNamePerUser.Id);
 
                     installAfter = rollbackNamePerMachine.Id;
                 }
 
-                Identifier installNamePerUser = this.Core.CreateIdentifier("viu", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
-                Identifier installNamePerMachine = this.Core.CreateIdentifier("vim", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
+                Identifier installNamePerUser = this.ParseHelper.CreateIdentifier("viu", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
+                Identifier installNamePerMachine = this.ParseHelper.CreateIdentifier("vim", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
                 string installCmdLinePerUser = String.Format("{0} \"[#{1}]\"", cmdlinePrefix, fileId);
                 string installCmdLinePerMachine = String.Concat(installCmdLinePerUser, " /admin");
                 string installConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
                 string installConditionPerMachine = String.Format("ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
 
-                this.SchedulePropertyExeAction(sourceLineNumbers, installNamePerUser, propertyId, installCmdLinePerUser, installExtraBits, installConditionPerUser, null, installAfter);
-                this.SchedulePropertyExeAction(sourceLineNumbers, installNamePerMachine, propertyId, installCmdLinePerMachine, installExtraBits | VSCompiler.MsidbCustomActionTypeNoImpersonate, installConditionPerMachine, null, installNamePerUser.Id);
+                this.SchedulePropertyExeAction(section, sourceLineNumbers, installNamePerUser, propertyId, installCmdLinePerUser, installExtraBits, installConditionPerUser, null, installAfter);
+                this.SchedulePropertyExeAction(section, sourceLineNumbers, installNamePerMachine, propertyId, installCmdLinePerMachine, installExtraBits | VSCompiler.MsidbCustomActionTypeNoImpersonate, installConditionPerMachine, null, installNamePerUser.Id);
 
                 // If not permanent, schedule the uninstall custom action.
                 if (permanent != YesNoType.Yes)
                 {
-                    Identifier uninstallNamePerUser = this.Core.CreateIdentifier("vuu", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
-                    Identifier uninstallNamePerMachine = this.Core.CreateIdentifier("vum", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
+                    Identifier uninstallNamePerUser = this.ParseHelper.CreateIdentifier("vuu", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
+                    Identifier uninstallNamePerMachine = this.ParseHelper.CreateIdentifier("vum", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
                     string uninstallCmdLinePerUser = String.Concat(cmdlinePrefix, " /u:\"", packageId, "\"");
                     string uninstallCmdLinePerMachine = String.Concat(uninstallCmdLinePerUser, " /admin");
                     int uninstallExtraBitsPerUser = VSCompiler.MsidbCustomActionTypeContinue | VSCompiler.MsidbCustomActionTypeInScript;
@@ -783,39 +722,39 @@ namespace WixToolset.Extensions
                     string uninstallConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
                     string uninstallConditionPerMachine = String.Format("ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
 
-                    this.SchedulePropertyExeAction(sourceLineNumbers, uninstallNamePerUser, propertyId, uninstallCmdLinePerUser, uninstallExtraBitsPerUser, uninstallConditionPerUser, "InstallFinalize", null);
-                    this.SchedulePropertyExeAction(sourceLineNumbers, uninstallNamePerMachine, propertyId, uninstallCmdLinePerMachine, uninstallExtraBitsPerMachine, uninstallConditionPerMachine, "InstallFinalize", null);
+                    this.SchedulePropertyExeAction(section, sourceLineNumbers, uninstallNamePerUser, propertyId, uninstallCmdLinePerUser, uninstallExtraBitsPerUser, uninstallConditionPerUser, "InstallFinalize", null);
+                    this.SchedulePropertyExeAction(section, sourceLineNumbers, uninstallNamePerMachine, propertyId, uninstallCmdLinePerMachine, uninstallExtraBitsPerMachine, uninstallConditionPerMachine, "InstallFinalize", null);
                 }
             }
         }
 
-        private void SchedulePropertyExeAction(SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, int extraBits, string condition, string beforeAction, string afterAction)
+        private void SchedulePropertyExeAction(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, int extraBits, string condition, string beforeAction, string afterAction)
         {
             const string sequence = "InstallExecuteSequence";
 
-            Row actionRow = this.Core.CreateRow(sourceLineNumbers, "CustomAction", name);
-            actionRow[1] = VSCompiler.MsidbCustomActionTypeProperty | VSCompiler.MsidbCustomActionTypeExe | extraBits;
-            actionRow[2] = source;
-            actionRow[3] = cmdline;
+            var actionRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "CustomAction", name);
+            actionRow.Set(1, VSCompiler.MsidbCustomActionTypeProperty | VSCompiler.MsidbCustomActionTypeExe | extraBits);
+            actionRow.Set(2, source);
+            actionRow.Set(3, cmdline);
 
-            Row sequenceRow = this.Core.CreateRow(sourceLineNumbers, "WixAction");
-            sequenceRow[0] = sequence;
-            sequenceRow[1] = name.Id;
-            sequenceRow[2] = condition;
+            var sequenceRow = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixAction", new Identifier(name.Access, sequence, name.Id));
+            sequenceRow.Set(0, sequence);
+            sequenceRow.Set(1, name.Id);
+            sequenceRow.Set(2, condition);
             // no explicit sequence
-            sequenceRow[4] = beforeAction;
-            sequenceRow[5] = afterAction;
-            sequenceRow[6] = 0; // not overridable
+            sequenceRow.Set(4, beforeAction);
+            sequenceRow.Set(5, afterAction);
+            sequenceRow.Set(6, 0); // not overridable
 
             if (null != beforeAction)
             {
                 if (WindowsInstallerStandard.IsStandardAction(beforeAction))
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", sequence, beforeAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixAction", sequence, beforeAction);
                 }
                 else
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", beforeAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", beforeAction);
                 }
             }
 
@@ -823,11 +762,11 @@ namespace WixToolset.Extensions
             {
                 if (WindowsInstallerStandard.IsStandardAction(afterAction))
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", sequence, afterAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixAction", sequence, afterAction);
                 }
                 else
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", afterAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", afterAction);
                 }
             }
         }