Move ComPlus.wixext into ext

37 files changed, 6358 insertions, 0 deletions

diff --git a/src/ext/ComPlus/wixext/ComPlusCompiler.cs b/src/ext/ComPlus/wixext/ComPlusCompiler.cs
new file mode 100644
index 00000000..4404801e
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusCompiler.cs
@@ -0,0 +1,2164 @@
+// 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.ComPlus
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Xml.Linq;
+    using WixToolset.ComPlus.Symbols;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// The compiler for the WiX Toolset COM+ Extension.
+    /// </summary>
+    public sealed class ComPlusCompiler : BaseCompilerExtension
+    {
+        /// <summary>
+        /// </summary>
+        /// <remarks></remarks>
+        public enum CpiAssemblyAttributes
+        {
+            EventClass = (1 << 0),
+            DotNetAssembly = (1 << 1),
+            DllPathFromGAC = (1 << 2),
+            RegisterInCommit = (1 << 3)
+        }
+
+        public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/complus";
+
+        /// <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(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
+        {
+            switch (parentElement.Name.LocalName)
+            {
+                case "Component":
+                    var componentId = context["ComponentId"];
+                    var directoryId = context["DirectoryId"];
+                    var win64 = Boolean.Parse(context["Win64"]);
+
+                    switch (element.Name.LocalName)
+                    {
+                        case "ComPlusPartition":
+                            this.ParseComPlusPartitionElement(intermediate, section, element, componentId, win64);
+                            break;
+                        case "ComPlusPartitionRole":
+                            this.ParseComPlusPartitionRoleElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusUserInPartitionRole":
+                            this.ParseComPlusUserInPartitionRoleElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusGroupInPartitionRole":
+                            this.ParseComPlusGroupInPartitionRoleElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusPartitionUser":
+                            this.ParseComPlusPartitionUserElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusApplication":
+                            this.ParseComPlusApplicationElement(intermediate, section, element, componentId, win64, null);
+                            break;
+                        case "ComPlusApplicationRole":
+                            this.ParseComPlusApplicationRoleElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusUserInApplicationRole":
+                            this.ParseComPlusUserInApplicationRoleElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusGroupInApplicationRole":
+                            this.ParseComPlusGroupInApplicationRoleElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusAssembly":
+                            this.ParseComPlusAssemblyElement(intermediate, section, element, componentId, win64, null);
+                            break;
+                        case "ComPlusRoleForComponent":
+                            this.ParseComPlusRoleForComponentElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusRoleForInterface":
+                            this.ParseComPlusRoleForInterfaceElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusRoleForMethod":
+                            this.ParseComPlusRoleForMethodElement(intermediate, section, element, componentId, null);
+                            break;
+                        case "ComPlusSubscription":
+                            this.ParseComPlusSubscriptionElement(intermediate, section, element, componentId, null);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(parentElement, element);
+                            break;
+                    }
+                    break;
+                case "Fragment":
+                case "Module":
+                case "Package":
+                    switch (element.Name.LocalName)
+                    {
+                        case "ComPlusPartition":
+                            this.ParseComPlusPartitionElement(intermediate, section, element, null, false);
+                            break;
+                        case "ComPlusPartitionRole":
+                            this.ParseComPlusPartitionRoleElement(intermediate, section, element, null, null);
+                            break;
+                        case "ComPlusApplication":
+                            this.ParseComPlusApplicationElement(intermediate, section, element, null, false, null);
+                            break;
+                        case "ComPlusApplicationRole":
+                            this.ParseComPlusApplicationRoleElement(intermediate, section, element, null, null);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(parentElement, element);
+                            break;
+                    }
+                    break;
+                default:
+                    this.ParseHelper.UnexpectedElement(parentElement, element);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ partition element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        private void ParseComPlusPartitionElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, bool win64)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string id = null;
+            string name = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "PartitionId":
+                            id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
+                            break;
+                        case "Name":
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Changeable":
+                            this.Messaging.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            break;
+                        case "Deleteable":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Deleteable"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "Description":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null != componentKey && null == name)
+            {
+                this.Messaging.Write(ComPlusErrors.RequiredAttributeUnderComponent(sourceLineNumbers, node.Name.LocalName, "Name"));
+            }
+            if (null == componentKey && null == id && null == name)
+            {
+                this.Messaging.Write(ComPlusErrors.RequiredAttributeNotUnderComponent(sourceLineNumbers, node.Name.LocalName, "Id", "Name"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusPartitionRole":
+                            this.ParseComPlusPartitionRoleElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusPartitionUser":
+                            this.ParseComPlusPartitionUserElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusApplication":
+                            this.ParseComPlusApplicationElement(intermediate, section, child, componentKey, win64, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            section.AddSymbol(new ComPlusPartitionSymbol(sourceLineNumbers, key)
+            {
+                ComponentRef = componentKey,
+                PartitionId = id,
+                Name = name,
+            });
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusPartitionPropertySymbol(sourceLineNumbers)
+                {
+                    PartitionRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+
+            if (componentKey != null)
+            {
+                this.AddReferenceToConfigureComPlus(section, sourceLineNumbers, node.Name.LocalName, win64);
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ partition role element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application.</param>
+        private void ParseComPlusPartitionRoleElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string partitionKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string name = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Partition":
+                            if (null != partitionKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey);
+                            break;
+                        case "Name":
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == partitionKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Partition"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusUserInPartitionRole":
+                            this.ParseComPlusUserInPartitionRoleElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusGroupInPartitionRole":
+                            this.ParseComPlusGroupInPartitionRoleElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            section.AddSymbol(new ComPlusPartitionRoleSymbol(sourceLineNumbers, key)
+            {
+                PartitionRef = partitionKey,
+                Name = name,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ partition role user element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application role.</param>
+        private void ParseComPlusUserInPartitionRoleElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string partitionRoleKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string user = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "PartitionRole":
+                            if (null != partitionRoleKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            partitionRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartitionRole, partitionRoleKey);
+                            break;
+                        case "User":
+                            user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "User", user);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == partitionRoleKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PartitionRole"));
+            }
+
+            section.AddSymbol(new ComPlusUserInPartitionRoleSymbol(sourceLineNumbers, key)
+            {
+                PartitionRoleRef = partitionRoleKey,
+                ComponentRef = componentKey,
+                UserRef = user,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ partition role user element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application role.</param>
+        private void ParseComPlusGroupInPartitionRoleElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string partitionRoleKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string group = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "PartitionRole":
+                            if (null != partitionRoleKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            partitionRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartitionRole, partitionRoleKey);
+                            break;
+                        case "Group":
+                            group = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Group", group);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == partitionRoleKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PartitionRole"));
+            }
+
+            section.AddSymbol(new ComPlusGroupInPartitionRoleSymbol(sourceLineNumbers, key)
+            {
+                PartitionRoleRef = partitionRoleKey,
+                ComponentRef = componentKey,
+                GroupRef = group,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ partition element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        private void ParseComPlusPartitionUserElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string partitionKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string user = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Partition":
+                            if (null != partitionKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey);
+                            break;
+                        case "User":
+                            user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "User", user);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == partitionKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Partition"));
+            }
+
+            section.AddSymbol(new ComPlusPartitionUserSymbol(sourceLineNumbers, key)
+            {
+                PartitionRef = partitionKey,
+                ComponentRef = componentKey,
+                UserRef = user,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ application element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="partitionKey">Optional identifier of parent partition.</param>
+        private void ParseComPlusApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, bool win64, string partitionKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string id = null;
+            string name = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Partition":
+                            if (null != partitionKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            partitionKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusPartition, partitionKey);
+                            break;
+                        case "ApplicationId":
+                            id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
+                            break;
+                        case "Name":
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "ThreeGigSupportEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["3GigSupportEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "AccessChecksLevel":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            var accessChecksLevelValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (accessChecksLevelValue)
+                            {
+                                case "applicationLevel":
+                                    properties["AccessChecksLevel"] = "0";
+                                    break;
+                                case "applicationComponentLevel":
+                                    properties["AccessChecksLevel"] = "1";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "AccessChecksLevel", accessChecksLevelValue, "applicationLevel", "applicationComponentLevel"));
+                                    break;
+                            }
+                            break;
+                        case "Activation":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            var activationValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (activationValue)
+                            {
+                                case "inproc":
+                                    properties["Activation"] = "Inproc";
+                                    break;
+                                case "local":
+                                    properties["Activation"] = "Local";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "Activation", activationValue, "inproc", "local"));
+                                    break;
+                            }
+                            break;
+                        case "ApplicationAccessChecksEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["ApplicationAccessChecksEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ApplicationDirectory":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["ApplicationDirectory"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Authentication":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            string authenticationValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (authenticationValue)
+                            {
+                                case "default":
+                                    properties["Authentication"] = "0";
+                                    break;
+                                case "none":
+                                    properties["Authentication"] = "1";
+                                    break;
+                                case "connect":
+                                    properties["Authentication"] = "2";
+                                    break;
+                                case "call":
+                                    properties["Authentication"] = "3";
+                                    break;
+                                case "packet":
+                                    properties["Authentication"] = "4";
+                                    break;
+                                case "integrity":
+                                    properties["Authentication"] = "5";
+                                    break;
+                                case "privacy":
+                                    properties["Authentication"] = "6";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "Authentication", authenticationValue, "default", "none", "connect", "call", "packet", "integrity", "privacy"));
+                                    break;
+                            }
+                            break;
+                        case "AuthenticationCapability":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            var authenticationCapabilityValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (authenticationCapabilityValue)
+                            {
+                                case "none":
+                                    properties["AuthenticationCapability"] = "0";
+                                    break;
+                                case "secureReference":
+                                    properties["AuthenticationCapability"] = "2";
+                                    break;
+                                case "staticCloaking":
+                                    properties["AuthenticationCapability"] = "32";
+                                    break;
+                                case "dynamicCloaking":
+                                    properties["AuthenticationCapability"] = "64";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "AuthenticationCapability", authenticationCapabilityValue, "none", "secureReference", "staticCloaking", "dynamicCloaking"));
+                                    break;
+                            }
+                            break;
+                        case "Changeable":
+                            this.Messaging.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            break;
+                        case "CommandLine":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["CommandLine"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "ConcurrentApps":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["ConcurrentApps"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "CreatedBy":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["CreatedBy"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "CRMEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["CRMEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "CRMLogFile":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["CRMLogFile"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Deleteable":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Deleteable"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "Description":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "DumpEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["DumpEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "DumpOnException":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["DumpOnException"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "DumpOnFailfast":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["DumpOnFailfast"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "DumpPath":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["DumpPath"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "EventsEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["EventsEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "Identity":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Identity"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "ImpersonationLevel":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            string impersonationLevelValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (impersonationLevelValue)
+                            {
+                                case "anonymous":
+                                    properties["ImpersonationLevel"] = "1";
+                                    break;
+                                case "identify":
+                                    properties["ImpersonationLevel"] = "2";
+                                    break;
+                                case "impersonate":
+                                    properties["ImpersonationLevel"] = "3";
+                                    break;
+                                case "delegate":
+                                    properties["ImpersonationLevel"] = "4";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "ImpersonationLevel", impersonationLevelValue, "anonymous", "identify", "impersonate", "delegate"));
+                                    break;
+                            }
+                            break;
+                        case "IsEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["IsEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "MaxDumpCount":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["MaxDumpCount"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Password":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Password"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "QCAuthenticateMsgs":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            string qcAuthenticateMsgsValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (qcAuthenticateMsgsValue)
+                            {
+                                case "secureApps":
+                                    properties["QCAuthenticateMsgs"] = "0";
+                                    break;
+                                case "off":
+                                    properties["QCAuthenticateMsgs"] = "1";
+                                    break;
+                                case "on":
+                                    properties["QCAuthenticateMsgs"] = "2";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "QCAuthenticateMsgs", qcAuthenticateMsgsValue, "secureApps", "off", "on"));
+                                    break;
+                            }
+                            break;
+                        case "QCListenerMaxThreads":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["QCListenerMaxThreads"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "QueueListenerEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["QueueListenerEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "QueuingEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["QueuingEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "RecycleActivationLimit":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["RecycleActivationLimit"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "RecycleCallLimit":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["RecycleCallLimit"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "RecycleExpirationTimeout":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["RecycleExpirationTimeout"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "RecycleLifetimeLimit":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["RecycleLifetimeLimit"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "RecycleMemoryLimit":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["RecycleMemoryLimit"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Replicable":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Replicable"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "RunForever":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["RunForever"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ShutdownAfter":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["ShutdownAfter"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SoapActivated":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["SoapActivated"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "SoapBaseUrl":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["SoapBaseUrl"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SoapMailTo":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["SoapMailTo"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SoapVRoot":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["SoapVRoot"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SRPEnabled":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["SRPEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "SRPTrustLevel":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            var srpTrustLevelValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (srpTrustLevelValue)
+                            {
+                                case "disallowed":
+                                    properties["SRPTrustLevel"] = "0";
+                                    break;
+                                case "fullyTrusted":
+                                    properties["SRPTrustLevel"] = "262144";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusApplication", "SRPTrustLevel", srpTrustLevelValue, "disallowed", "fullyTrusted"));
+                                    break;
+                            }
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null != componentKey && null == name)
+            {
+                this.Messaging.Write(ComPlusErrors.RequiredAttributeUnderComponent(sourceLineNumbers, node.Name.LocalName, "Name"));
+            }
+            if (null == componentKey && null == id && null == name)
+            {
+                this.Messaging.Write(ComPlusErrors.RequiredAttributeNotUnderComponent(sourceLineNumbers, node.Name.LocalName, "Id", "Name"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusApplicationRole":
+                            this.ParseComPlusApplicationRoleElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusAssembly":
+                            this.ParseComPlusAssemblyElement(intermediate, section, child, componentKey, win64, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            section.AddSymbol(new ComPlusApplicationSymbol(sourceLineNumbers, key)
+            {
+                PartitionRef = partitionKey,
+                ComponentRef = componentKey,
+                ApplicationId = id,
+                Name = name,
+            });
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusApplicationPropertySymbol(sourceLineNumbers)
+                {
+                    ApplicationRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+
+            if (componentKey != null)
+            {
+                this.AddReferenceToConfigureComPlus(section, sourceLineNumbers, node.Name.LocalName, win64);
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ application role element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application.</param>
+        private void ParseComPlusApplicationRoleElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string applicationKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string name = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Application":
+                            if (null != applicationKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            applicationKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplication, applicationKey);
+                            break;
+                        case "Name":
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Description":
+                            if (null == componentKey)
+                            {
+                                this.Messaging.Write(ComPlusErrors.IllegalAttributeWithoutComponent(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            }
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == applicationKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Application"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusUserInApplicationRole":
+                            this.ParseComPlusUserInApplicationRoleElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusGroupInApplicationRole":
+                            this.ParseComPlusGroupInApplicationRoleElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            section.AddSymbol(new ComPlusApplicationRoleSymbol(sourceLineNumbers, key)
+            {
+                ApplicationRef = applicationKey,
+                ComponentRef = componentKey,
+                Name = name,
+            });
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusApplicationRolePropertySymbol(sourceLineNumbers)
+                {
+                    ApplicationRoleRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ application role user element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application role.</param>
+        private void ParseComPlusUserInApplicationRoleElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string applicationRoleKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string user = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "ApplicationRole":
+                            if (null != applicationRoleKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplicationRole, applicationRoleKey);
+                            break;
+                        case "User":
+                            user = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "User", user);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == applicationRoleKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ApplicationRole"));
+            }
+
+            section.AddSymbol(new ComPlusUserInApplicationRoleSymbol(sourceLineNumbers, key)
+            {
+                ApplicationRoleRef = applicationRoleKey,
+                ComponentRef = componentKey,
+                UserRef = user,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ application role group element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application role.</param>
+        private void ParseComPlusGroupInApplicationRoleElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string applicationRoleKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string group = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "ApplicationRole":
+                            if (null != applicationRoleKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplicationRole, applicationRoleKey);
+                            break;
+                        case "Group":
+                            group = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Group", group);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == applicationRoleKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ApplicationRole"));
+            }
+
+            section.AddSymbol(new ComPlusGroupInApplicationRoleSymbol(sourceLineNumbers, key)
+            {
+                ApplicationRoleRef = applicationRoleKey,
+                ComponentRef = componentKey,
+                GroupRef = group,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ assembly element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="applicationKey">Optional identifier of parent application.</param>
+        private void ParseComPlusAssemblyElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, bool win64, string applicationKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string assemblyName = null;
+            string dllPath = null;
+            string tlbPath = null;
+            string psDllPath = null;
+            int attributes = 0;
+
+            var hasComponents = false;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Application":
+                            if (null != applicationKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            applicationKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusApplication, applicationKey);
+                            break;
+                        case "AssemblyName":
+                            assemblyName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "DllPath":
+                            dllPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "TlbPath":
+                            tlbPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "PSDllPath":
+                            psDllPath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Type":
+                            string typeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (typeValue)
+                            {
+                                case ".net":
+                                    attributes |= (int)CpiAssemblyAttributes.DotNetAssembly;
+                                    break;
+                                case "native":
+                                    attributes &= ~(int)CpiAssemblyAttributes.DotNetAssembly;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusAssembly", "Type", typeValue, ".net", "native"));
+                                    break;
+                            }
+                            break;
+                        case "EventClass":
+                            if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            {
+                                attributes |= (int)CpiAssemblyAttributes.EventClass;
+                            }
+                            else
+                            {
+                                attributes &= ~(int)CpiAssemblyAttributes.EventClass;
+                            }
+                            break;
+                        case "DllPathFromGAC":
+                            if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            {
+                                attributes |= (int)CpiAssemblyAttributes.DllPathFromGAC;
+                            }
+                            else
+                            {
+                                attributes &= ~(int)CpiAssemblyAttributes.DllPathFromGAC;
+                            }
+                            break;
+                        case "RegisterInCommit":
+                            if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib))
+                            {
+                                attributes |= (int)CpiAssemblyAttributes.RegisterInCommit;
+                            }
+                            else
+                            {
+                                attributes &= ~(int)CpiAssemblyAttributes.RegisterInCommit;
+                            }
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == applicationKey && 0 == (attributes & (int)CpiAssemblyAttributes.DotNetAssembly))
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Application", "Type", "native"));
+            }
+            if (null != assemblyName && 0 == (attributes & (int)CpiAssemblyAttributes.DllPathFromGAC))
+            {
+                this.Messaging.Write(ComPlusErrors.UnexpectedAttributeWithoutOtherValue(sourceLineNumbers, node.Name.LocalName, "AssemblyName", "DllPathFromGAC", "no"));
+            }
+            if (null == tlbPath && 0 != (attributes & (int)CpiAssemblyAttributes.DotNetAssembly))
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TlbPath", "Type", ".net"));
+            }
+            if (null != psDllPath && 0 != (attributes & (int)CpiAssemblyAttributes.DotNetAssembly))
+            {
+                this.Messaging.Write(ComPlusErrors.UnexpectedAttributeWithOtherValue(sourceLineNumbers, node.Name.LocalName, "PSDllPath", "Type", ".net"));
+            }
+            if (0 != (attributes & (int)CpiAssemblyAttributes.EventClass) && 0 != (attributes & (int)CpiAssemblyAttributes.DotNetAssembly))
+            {
+                this.Messaging.Write(ComPlusErrors.UnexpectedAttributeWithOtherValue(sourceLineNumbers, node.Name.LocalName, "EventClass", "yes", "Type", ".net"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusAssemblyDependency":
+                            this.ParseComPlusAssemblyDependencyElement(intermediate, section, child, key?.Id);
+                            break;
+                        case "ComPlusComponent":
+                            this.ParseComPlusComponentElement(intermediate, section, child, componentKey, key?.Id);
+                            hasComponents = true;
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            if (0 == (attributes & (int)CpiAssemblyAttributes.DotNetAssembly) && !hasComponents)
+            {
+                this.Messaging.Write(ComPlusWarnings.MissingComponents(sourceLineNumbers));
+            }
+
+            section.AddSymbol(new ComPlusAssemblySymbol(sourceLineNumbers, key)
+            {
+                ApplicationRef = applicationKey,
+                ComponentRef = componentKey,
+                AssemblyName = assemblyName,
+                DllPath = dllPath,
+                TlbPath = tlbPath,
+                PSDllPath = psDllPath,
+                Attributes = attributes,
+            });
+
+            this.AddReferenceToConfigureComPlus(section, sourceLineNumbers, node.Name.LocalName, win64);
+        }
+
+        /// <summary>
+        /// Parses a COM+ assembly dependency element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="assemblyKey">Identifier of parent assembly.</param>
+        private void ParseComPlusAssemblyDependencyElement(Intermediate intermediate, IntermediateSection section, XElement node, string assemblyKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            string requiredAssemblyKey = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "RequiredAssembly":
+                            requiredAssemblyKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            section.AddSymbol(new ComPlusAssemblyDependencySymbol(sourceLineNumbers)
+            {
+                AssemblyRef = assemblyKey,
+                RequiredAssemblyRef = requiredAssemblyKey,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ component element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="assemblyKey">Identifier of parent assembly.</param>
+        private void ParseComPlusComponentElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string assemblyKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string clsid = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "CLSID":
+                            clsid = "{" + this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib) + "}";
+                            break;
+                        case "AllowInprocSubscribers":
+                            properties["AllowInprocSubscribers"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ComponentAccessChecksEnabled":
+                            properties["ComponentAccessChecksEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ComponentTransactionTimeout":
+                            properties["ComponentTransactionTimeout"] = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, 3600).ToString();
+                            break;
+                        case "ComponentTransactionTimeoutEnabled":
+                            properties["ComponentTransactionTimeoutEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "COMTIIntrinsics":
+                            properties["COMTIIntrinsics"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ConstructionEnabled":
+                            properties["ConstructionEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ConstructorString":
+                            properties["ConstructorString"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "CreationTimeout":
+                            properties["CreationTimeout"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Description":
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "EventTrackingEnabled":
+                            properties["EventTrackingEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ExceptionClass":
+                            properties["ExceptionClass"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "FireInParallel":
+                            properties["FireInParallel"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "IISIntrinsics":
+                            properties["IISIntrinsics"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "InitializesServerApplication":
+                            properties["InitializesServerApplication"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "IsEnabled":
+                            properties["IsEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "IsPrivateComponent":
+                            properties["IsPrivateComponent"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "JustInTimeActivation":
+                            properties["JustInTimeActivation"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "LoadBalancingSupported":
+                            properties["LoadBalancingSupported"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "MaxPoolSize":
+                            properties["MaxPoolSize"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "MinPoolSize":
+                            properties["MinPoolSize"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "MultiInterfacePublisherFilterCLSID":
+                            properties["MultiInterfacePublisherFilterCLSID"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "MustRunInClientContext":
+                            properties["MustRunInClientContext"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "MustRunInDefaultContext":
+                            properties["MustRunInDefaultContext"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "ObjectPoolingEnabled":
+                            properties["ObjectPoolingEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "PublisherID":
+                            properties["PublisherID"] = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
+                            break;
+                        case "SoapAssemblyName":
+                            properties["SoapAssemblyName"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SoapTypeName":
+                            properties["SoapTypeName"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Synchronization":
+                            var synchronizationValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (synchronizationValue)
+                            {
+                                case "ignored":
+                                    properties["Synchronization"] = "0";
+                                    break;
+                                case "none":
+                                    properties["Synchronization"] = "1";
+                                    break;
+                                case "supported":
+                                    properties["Synchronization"] = "2";
+                                    break;
+                                case "required":
+                                    properties["Synchronization"] = "3";
+                                    break;
+                                case "requiresNew":
+                                    properties["Synchronization"] = "4";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusComponent", "Synchronization", synchronizationValue, "ignored", "none", "supported", "required", "requiresNew"));
+                                    break;
+                            }
+                            break;
+                        case "Transaction":
+                            var transactionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (transactionValue)
+                            {
+                                case "ignored":
+                                    properties["Transaction"] = "0";
+                                    break;
+                                case "none":
+                                    properties["Transaction"] = "1";
+                                    break;
+                                case "supported":
+                                    properties["Transaction"] = "2";
+                                    break;
+                                case "required":
+                                    properties["Transaction"] = "3";
+                                    break;
+                                case "requiresNew":
+                                    properties["Transaction"] = "4";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusComponent", "Transaction", transactionValue, "ignored", "none", "supported", "required", "requiresNew"));
+                                    break;
+                            }
+                            break;
+                        case "TxIsolationLevel":
+                            var txIsolationLevelValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (txIsolationLevelValue)
+                            {
+                                case "any":
+                                    properties["TxIsolationLevel"] = "0";
+                                    break;
+                                case "readUnCommitted":
+                                    properties["TxIsolationLevel"] = "1";
+                                    break;
+                                case "readCommitted":
+                                    properties["TxIsolationLevel"] = "2";
+                                    break;
+                                case "repeatableRead":
+                                    properties["TxIsolationLevel"] = "3";
+                                    break;
+                                case "serializable":
+                                    properties["TxIsolationLevel"] = "4";
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "ComPlusComponent", "TxIsolationLevel", txIsolationLevelValue, "any", "readUnCommitted", "readCommitted", "repeatableRead", "serializable"));
+                                    break;
+                            }
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusRoleForComponent":
+                            this.ParseComPlusRoleForComponentElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusInterface":
+                            this.ParseComPlusInterfaceElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusSubscription":
+                            this.ParseComPlusSubscriptionElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            section.AddSymbol(new ComPlusComponentSymbol(sourceLineNumbers, key)
+            {
+                AssemblyRef = assemblyKey,
+                CLSID = clsid,
+            });
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusComponentPropertySymbol(sourceLineNumbers)
+                {
+                    ComPlusComponentRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ application role for component element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="cpcomponentKey">Identifier of parent COM+ component.</param>
+        private void ParseComPlusRoleForComponentElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string cpcomponentKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string applicationRoleKey = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Component":
+                            if (null != cpcomponentKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            cpcomponentKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusComponent, cpcomponentKey);
+                            break;
+                        case "ApplicationRole":
+                            applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == cpcomponentKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Component"));
+            }
+
+            section.AddSymbol(new ComPlusRoleForComponentSymbol(sourceLineNumbers, key)
+            {
+                ComPlusComponentRef = cpcomponentKey,
+                ApplicationRoleRef = applicationRoleKey,
+                ComponentRef = componentKey,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ interface element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="cpcomponentKey">Identifier of parent COM+ component.</param>
+        private void ParseComPlusInterfaceElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string cpcomponentKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            // parse attributes
+            Identifier key = null;
+            string iid = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "IID":
+                            iid = "{" + this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib) + "}";
+                            break;
+                        case "Description":
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "QueuingEnabled":
+                            properties["QueuingEnabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusRoleForInterface":
+                            this.ParseComPlusRoleForInterfaceElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        case "ComPlusMethod":
+                            this.ParseComPlusMethodElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            section.AddSymbol(new ComPlusInterfaceSymbol(sourceLineNumbers, key)
+            {
+                ComPlusComponentRef = cpcomponentKey,
+                IID = iid,
+            });
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusInterfacePropertySymbol(sourceLineNumbers)
+                {
+                    InterfaceRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ application role for interface element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="interfaceKey">Identifier of parent interface.</param>
+        private void ParseComPlusRoleForInterfaceElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string interfaceKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string applicationRoleKey = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Interface":
+                            if (null != interfaceKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            interfaceKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusInterface, interfaceKey);
+                            break;
+                        case "ApplicationRole":
+                            applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == interfaceKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Interface"));
+            }
+
+            section.AddSymbol(new ComPlusRoleForInterfaceSymbol(sourceLineNumbers, key)
+            {
+                InterfaceRef = interfaceKey,
+                ApplicationRoleRef = applicationRoleKey,
+                ComponentRef = componentKey,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ method element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="interfaceKey">Identifier of parent interface.</param>
+        private void ParseComPlusMethodElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string interfaceKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            var index = CompilerConstants.IntegerNotSet;
+            string name = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Index":
+                            index = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue);
+                            break;
+                        case "Name":
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "AutoComplete":
+                            properties["AutoComplete"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "Description":
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "ComPlusRoleForMethod":
+                            this.ParseComPlusRoleForMethodElement(intermediate, section, child, componentKey, key?.Id);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionElement(this.Context.Extensions, intermediate, section, node, child);
+                }
+            }
+
+            if (CompilerConstants.IntegerNotSet == index && null == name)
+            {
+                this.Messaging.Write(ComPlusErrors.RequiredAttribute(sourceLineNumbers, node.Name.LocalName, "Index", "Name"));
+            }
+
+            var symbol = section.AddSymbol(new ComPlusMethodSymbol(sourceLineNumbers, key)
+            {
+                InterfaceRef = interfaceKey,
+                Name = name,
+            });
+
+            if (CompilerConstants.IntegerNotSet != index)
+            {
+                symbol.Index = index;
+            }
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusMethodPropertySymbol(sourceLineNumbers)
+                {
+                    MethodRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+        }
+
+        /// <summary>
+        /// Parses a COM+ application role for method element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="methodKey">Identifier of parent method.</param>
+        private void ParseComPlusRoleForMethodElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string methodKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string applicationRoleKey = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Method":
+                            if (null != methodKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            methodKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusMethod, methodKey);
+                            break;
+                        case "ApplicationRole":
+                            applicationRoleKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == methodKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Method"));
+            }
+
+            section.AddSymbol(new ComPlusRoleForMethodSymbol(sourceLineNumbers, key)
+            {
+                MethodRef = methodKey,
+                ApplicationRoleRef = applicationRoleKey,
+                ComponentRef = componentKey,
+            });
+        }
+
+        /// <summary>
+        /// Parses a COM+ event subscription element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        /// <param name="componentKey">Identifier of parent component.</param>
+        /// <param name="cpcomponentKey">Identifier of parent COM+ component.</param>
+        private void ParseComPlusSubscriptionElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentKey, string cpcomponentKey)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+
+            Identifier key = null;
+            string id = null;
+            string name = null;
+            string eventCLSID = null;
+            string publisherID = null;
+
+            var properties = new Dictionary<string, string>();
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            key = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Component":
+                            if (null != cpcomponentKey)
+                            {
+                                this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
+                            }
+                            cpcomponentKey = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ComPlusSymbolDefinitions.ComPlusComponent, cpcomponentKey);
+                            break;
+                        case "SubscriptionId":
+                            id = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
+                            break;
+                        case "Name":
+                            name = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "EventCLSID":
+                            eventCLSID = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "PublisherID":
+                            publisherID = this.TryFormatGuidValue(this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib));
+                            break;
+                        case "Description":
+                            properties["Description"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Enabled":
+                            properties["Enabled"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "EventClassPartitionID":
+                            properties["EventClassPartitionID"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "FilterCriteria":
+                            properties["FilterCriteria"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "InterfaceID":
+                            properties["InterfaceID"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "MachineName":
+                            properties["MachineName"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "MethodName":
+                            properties["MethodName"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "PerUser":
+                            properties["PerUser"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "Queued":
+                            properties["Queued"] = YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) ? "1" : "0";
+                            break;
+                        case "SubscriberMoniker":
+                            properties["SubscriberMoniker"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "UserName":
+                            properties["UserName"] = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            if (null == cpcomponentKey)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Component"));
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
+
+            section.AddSymbol(new ComPlusSubscriptionSymbol(sourceLineNumbers, key)
+            {
+                Subscription = key?.Id,
+                ComPlusComponentRef = cpcomponentKey,
+                ComponentRef = componentKey,
+                SubscriptionId = id,
+                Name = name,
+                EventCLSID = eventCLSID,
+                PublisherID = publisherID,
+            });
+
+            foreach (var kvp in properties)
+            {
+                section.AddSymbol(new ComPlusSubscriptionPropertySymbol(sourceLineNumbers)
+                {
+                    SubscriptionRef = key?.Id,
+                    Name = kvp.Key,
+                    Value = kvp.Value,
+                });
+            }
+        }
+
+        /// <summary>
+        /// Attempts to parse the input value as a GUID, and in case the value is a valid
+        /// GUID returnes it in the format "{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}".
+        /// </summary>
+        /// <param name="val"></param>
+        /// <returns></returns>
+        private string TryFormatGuidValue(string val)
+        {
+            if (!Guid.TryParse(val, out var guid))
+            {
+                return val;
+            }
+            return guid.ToString("B").ToUpper();
+        }
+
+        private void AddReferenceToConfigureComPlus(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, bool win64)
+        {
+            if (win64)
+            {
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall_x64");
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall_x64");
+            }
+            else
+            {
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall");
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall");
+            }
+
+        }
+    }
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusDecompiler.cs b/src/ext/ComPlus/wixext/ComPlusDecompiler.cs
new file mode 100644
index 00000000..6da2df94
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusDecompiler.cs
@@ -0,0 +1,1845 @@
+// 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.ComPlus
+{
+#if TODO_CONSIDER_DECOMPILER
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using ComPlus = WixToolset.Extensions.Serialize.ComPlus;
+    using Wix = WixToolset.Data.Serialize;
+
+    /// <summary>
+    /// The decompiler for the WiX Toolset COM+ Extension.
+    /// </summary>
+    public sealed class ComPlusDecompiler : DecompilerExtension
+    {
+        /// <summary>
+        /// Creates a decompiler for ComPlus Extension.
+        /// </summary>
+        public ComPlusDecompiler()
+        {
+            this.TableDefinitions = ComPlusExtensionData.GetExtensionTableDefinitions();
+        }
+
+        /// <summary>
+        /// Get the extensions library to be removed.
+        /// </summary>
+        /// <param name="tableDefinitions">Table definitions for library.</param>
+        /// <returns>Library to remove from decompiled output.</returns>
+        public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions)
+        {
+            return ComPlusExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Decompiles an extension table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        public override void DecompileTable(Table table)
+        {
+            switch (table.Name)
+            {
+                case "ComPlusPartition":
+                    this.DecompileComPlusPartitionTable(table);
+                    break;
+                case "ComPlusPartitionProperty":
+                    this.DecompileComPlusPartitionPropertyTable(table);
+                    break;
+                case "ComPlusPartitionRole":
+                    this.DecompileComPlusPartitionRoleTable(table);
+                    break;
+                case "ComPlusUserInPartitionRole":
+                    this.DecompileComPlusUserInPartitionRoleTable(table);
+                    break;
+                case "ComPlusGroupInPartitionRole":
+                    this.DecompileComPlusGroupInPartitionRoleTable(table);
+                    break;
+                case "ComPlusPartitionUser":
+                    this.DecompileComPlusPartitionUserTable(table);
+                    break;
+                case "ComPlusApplication":
+                    this.DecompileComPlusApplicationTable(table);
+                    break;
+                case "ComPlusApplicationProperty":
+                    this.DecompileComPlusApplicationPropertyTable(table);
+                    break;
+                case "ComPlusApplicationRole":
+                    this.DecompileComPlusApplicationRoleTable(table);
+                    break;
+                case "ComPlusApplicationRoleProperty":
+                    this.DecompileComPlusApplicationRolePropertyTable(table);
+                    break;
+                case "ComPlusUserInApplicationRole":
+                    this.DecompileComPlusUserInApplicationRoleTable(table);
+                    break;
+                case "ComPlusGroupInApplicationRole":
+                    this.DecompileComPlusGroupInApplicationRoleTable(table);
+                    break;
+                case "ComPlusAssembly":
+                    this.DecompileComPlusAssemblyTable(table);
+                    break;
+                case "ComPlusComponent":
+                    this.DecompileComPlusComponentTable(table);
+                    break;
+                case "ComPlusComponentProperty":
+                    this.DecompileComPlusComponentPropertyTable(table);
+                    break;
+                case "ComPlusRoleForComponent":
+                    this.DecompileComPlusRoleForComponentTable(table);
+                    break;
+                case "ComPlusInterface":
+                    this.DecompileComPlusInterfaceTable(table);
+                    break;
+                case "ComPlusInterfaceProperty":
+                    this.DecompileComPlusInterfacePropertyTable(table);
+                    break;
+                case "ComPlusRoleForInterface":
+                    this.DecompileComPlusRoleForInterfaceTable(table);
+                    break;
+                case "ComPlusMethod":
+                    this.DecompileComPlusMethodTable(table);
+                    break;
+                case "ComPlusMethodProperty":
+                    this.DecompileComPlusMethodPropertyTable(table);
+                    break;
+                case "ComPlusRoleForMethod":
+                    this.DecompileComPlusRoleForMethodTable(table);
+                    break;
+                case "ComPlusSubscription":
+                    this.DecompileComPlusSubscriptionTable(table);
+                    break;
+                case "ComPlusSubscriptionProperty":
+                    this.DecompileComPlusSubscriptionPropertyTable(table);
+                    break;
+                default:
+                    base.DecompileTable(table);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusPartition table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusPartitionTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusPartition partition = new ComPlus.ComPlusPartition();
+
+                partition.Id = (string)row[0];
+
+                if (null != row[2])
+                {
+                    partition.PartitionId = (string)row[2];
+                }
+
+                if (null != row[3])
+                {
+                    partition.Name = (string)row[3];
+                }
+
+                if (null != row[1])
+                {
+                    Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]);
+                    if (null != component)
+                    {
+                        component.AddChild(partition);
+                    }
+                    else
+                    {
+                        this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[1], "Component"));
+                    }
+                }
+                else
+                {
+                    this.Core.RootElement.AddChild(partition);
+                }
+                this.Core.IndexElement(row, partition);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusPartitionProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusPartitionPropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusPartition partition = (ComPlus.ComPlusPartition)this.Core.GetIndexedElement("ComPlusPartition", (string)row[0]);
+                if (null == partition)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Partition_", (string)row[0], "ComPlusPartition"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "Changeable":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                partition.Changeable = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                partition.Changeable = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Deleteable":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                partition.Deleteable = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                partition.Deleteable = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Description":
+                        partition.Description = (string)row[2];
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusPartitionRole table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusPartitionRoleTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusPartitionRole partitionRole = new ComPlus.ComPlusPartitionRole();
+
+                partitionRole.Id = (string)row[0];
+                partitionRole.Partition = (string)row[1];
+                partitionRole.Name = (string)row[3];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(partitionRole);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusUserInPartitionRole table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusUserInPartitionRoleTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusUserInPartitionRole userInPartitionRole = new ComPlus.ComPlusUserInPartitionRole();
+
+                userInPartitionRole.Id = (string)row[0];
+                userInPartitionRole.PartitionRole = (string)row[1];
+                userInPartitionRole.User = (string)row[3];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(userInPartitionRole);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusGroupInPartitionRole table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusGroupInPartitionRoleTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusGroupInPartitionRole groupInPartitionRole = new ComPlus.ComPlusGroupInPartitionRole();
+
+                groupInPartitionRole.Id = (string)row[0];
+                groupInPartitionRole.PartitionRole = (string)row[1];
+                groupInPartitionRole.Group = (string)row[3];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(groupInPartitionRole);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusPartitionUser table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusPartitionUserTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusPartitionUser partitionUser = new ComPlus.ComPlusPartitionUser();
+
+                partitionUser.Id = (string)row[0];
+                partitionUser.Partition = (string)row[1];
+                partitionUser.User = (string)row[3];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(partitionUser);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusApplication table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusApplicationTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusApplication application = new ComPlus.ComPlusApplication();
+
+                application.Id = (string)row[0];
+                application.Partition = (string)row[1];
+
+                if (null != row[3])
+                {
+                    application.ApplicationId = (string)row[3];
+                }
+
+                if (null != row[4])
+                {
+                    application.Name = (string)row[4];
+                }
+
+                if (null != row[2])
+                {
+                    Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[1]);
+                    if (null != component)
+                    {
+                        component.AddChild(application);
+                    }
+                    else
+                    {
+                        this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                    }
+                }
+                else
+                {
+                    this.Core.RootElement.AddChild(application);
+                }
+                this.Core.IndexElement(row, application);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusApplicationProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusApplicationPropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusApplication application = (ComPlus.ComPlusApplication)this.Core.GetIndexedElement("ComPlusApplication", (string)row[0]);
+                if (null == application)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Application_", (string)row[0], "ComPlusApplication"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "3GigSupportEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.ThreeGigSupportEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.ThreeGigSupportEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "AccessChecksLevel":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                application.AccessChecksLevel = ComPlus.ComPlusApplication.AccessChecksLevelType.applicationLevel;
+                                break;
+                            case "1":
+                                application.AccessChecksLevel = ComPlus.ComPlusApplication.AccessChecksLevelType.applicationComponentLevel;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Activation":
+                        switch ((string)row[2])
+                        {
+                            case "Inproc":
+                                application.Activation = ComPlus.ComPlusApplication.ActivationType.inproc;
+                                break;
+                            case "Local":
+                                application.Activation = ComPlus.ComPlusApplication.ActivationType.local;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ApplicationAccessChecksEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.ApplicationAccessChecksEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.ApplicationAccessChecksEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ApplicationDirectory":
+                        application.ApplicationDirectory = (string)row[2];
+                        break;
+                    case "Authentication":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.@default;
+                                break;
+                            case "1":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.none;
+                                break;
+                            case "2":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.connect;
+                                break;
+                            case "3":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.call;
+                                break;
+                            case "4":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.packet;
+                                break;
+                            case "5":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.integrity;
+                                break;
+                            case "6":
+                                application.Authentication = ComPlus.ComPlusApplication.AuthenticationType.privacy;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "AuthenticationCapability":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                application.AuthenticationCapability = ComPlus.ComPlusApplication.AuthenticationCapabilityType.none;
+                                break;
+                            case "2":
+                                application.AuthenticationCapability = ComPlus.ComPlusApplication.AuthenticationCapabilityType.secureReference;
+                                break;
+                            case "32":
+                                application.AuthenticationCapability = ComPlus.ComPlusApplication.AuthenticationCapabilityType.staticCloaking;
+                                break;
+                            case "64":
+                                application.AuthenticationCapability = ComPlus.ComPlusApplication.AuthenticationCapabilityType.dynamicCloaking;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Changeable":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.Changeable = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.Changeable = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "CommandLine":
+                        application.CommandLine = (string)row[2];
+                        break;
+                    case "ConcurrentApps":
+                        int concurrentApps;
+                        if (Int32.TryParse((string)row[2], out concurrentApps))
+                        {
+                            application.ConcurrentApps = concurrentApps;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "CreatedBy":
+                        application.CreatedBy = (string)row[2];
+                        break;
+                    case "CRMEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.CRMEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.CRMEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "CRMLogFile":
+                        application.CRMLogFile = (string)row[2];
+                        break;
+                    case "Deleteable":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.Deleteable = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.Deleteable = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Description":
+                        application.Description = (string)row[2];
+                        break;
+                    case "DumpEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.DumpEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.DumpEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "DumpOnException":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.DumpOnException = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.DumpOnException = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "DumpOnFailfast":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.DumpOnFailfast = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.DumpOnFailfast = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "DumpPath":
+                        application.DumpPath = (string)row[2];
+                        break;
+                    case "EventsEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.EventsEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.EventsEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Identity":
+                        application.Identity = (string)row[2];
+                        break;
+                    case "ImpersonationLevel":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.ImpersonationLevel = ComPlus.ComPlusApplication.ImpersonationLevelType.anonymous;
+                                break;
+                            case "2":
+                                application.ImpersonationLevel = ComPlus.ComPlusApplication.ImpersonationLevelType.identify;
+                                break;
+                            case "3":
+                                application.ImpersonationLevel = ComPlus.ComPlusApplication.ImpersonationLevelType.impersonate;
+                                break;
+                            case "4":
+                                application.ImpersonationLevel = ComPlus.ComPlusApplication.ImpersonationLevelType.@delegate;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "IsEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.IsEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.IsEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "MaxDumpCount":
+                        int maxDumpCount;
+                        if (Int32.TryParse((string)row[2], out maxDumpCount))
+                        {
+                            application.MaxDumpCount = maxDumpCount;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "Password":
+                        application.Password = (string)row[2];
+                        break;
+                    case "QCAuthenticateMsgs":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                application.QCAuthenticateMsgs = ComPlus.ComPlusApplication.QCAuthenticateMsgsType.secureApps;
+                                break;
+                            case "1":
+                                application.QCAuthenticateMsgs = ComPlus.ComPlusApplication.QCAuthenticateMsgsType.off;
+                                break;
+                            case "2":
+                                application.QCAuthenticateMsgs = ComPlus.ComPlusApplication.QCAuthenticateMsgsType.on;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "QCListenerMaxThreads":
+                        int qcListenerMaxThreads;
+                        if (Int32.TryParse((string)row[2], out qcListenerMaxThreads))
+                        {
+                            application.QCListenerMaxThreads = qcListenerMaxThreads;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "QueueListenerEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.QueueListenerEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.QueueListenerEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "QueuingEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.QueuingEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.QueuingEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "RecycleActivationLimit":
+                        int recycleActivationLimit;
+                        if (Int32.TryParse((string)row[2], out recycleActivationLimit))
+                        {
+                            application.RecycleActivationLimit = recycleActivationLimit;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "RecycleCallLimit":
+                        int recycleCallLimit;
+                        if (Int32.TryParse((string)row[2], out recycleCallLimit))
+                        {
+                            application.RecycleCallLimit = recycleCallLimit;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "RecycleExpirationTimeout":
+                        int recycleExpirationTimeout;
+                        if (Int32.TryParse((string)row[2], out recycleExpirationTimeout))
+                        {
+                            application.RecycleExpirationTimeout = recycleExpirationTimeout;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "RecycleLifetimeLimit":
+                        int recycleLifetimeLimit;
+                        if (Int32.TryParse((string)row[2], out recycleLifetimeLimit))
+                        {
+                            application.RecycleLifetimeLimit = recycleLifetimeLimit;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "RecycleMemoryLimit":
+                        int recycleMemoryLimit;
+                        if (Int32.TryParse((string)row[2], out recycleMemoryLimit))
+                        {
+                            application.RecycleMemoryLimit = recycleMemoryLimit;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "Replicable":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.Replicable = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.Replicable = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "RunForever":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.RunForever = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.RunForever = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ShutdownAfter":
+                        int shutdownAfter;
+                        if (Int32.TryParse((string)row[2], out shutdownAfter))
+                        {
+                            application.ShutdownAfter = shutdownAfter;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "SoapActivated":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.SoapActivated = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.SoapActivated = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "SoapBaseUrl":
+                        application.SoapBaseUrl = (string)row[2];
+                        break;
+                    case "SoapMailTo":
+                        application.SoapMailTo = (string)row[2];
+                        break;
+                    case "SoapVRoot":
+                        application.SoapVRoot = (string)row[2];
+                        break;
+                    case "SRPEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                application.SRPEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                application.SRPEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "SRPTrustLevel":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                application.SRPTrustLevel = ComPlus.ComPlusApplication.SRPTrustLevelType.disallowed;
+                                break;
+                            case "262144":
+                                application.SRPTrustLevel = ComPlus.ComPlusApplication.SRPTrustLevelType.fullyTrusted;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusApplicationRole table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusApplicationRoleTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusApplicationRole applicationRole = new ComPlus.ComPlusApplicationRole();
+
+                applicationRole.Id = (string)row[0];
+                applicationRole.Application = (string)row[1];
+
+                if (null != row[3])
+                {
+                    applicationRole.Name = (string)row[3];
+                }
+
+                if (null != row[2])
+                {
+                    Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                    if (null != component)
+                    {
+                        component.AddChild(applicationRole);
+                    }
+                    else
+                    {
+                        this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                    }
+                }
+                else
+                {
+                    this.Core.RootElement.AddChild(applicationRole);
+                }
+                this.Core.IndexElement(row, applicationRole);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusApplicationRoleProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusApplicationRolePropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusApplicationRole applicationRole = (ComPlus.ComPlusApplicationRole)this.Core.GetIndexedElement("ComPlusApplicationRole", (string)row[0]);
+                if (null == applicationRole)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ApplicationRole_", (string)row[0], "ComPlusApplicationRole"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "Description":
+                        applicationRole.Description = (string)row[2];
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusUserInApplicationRole table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusUserInApplicationRoleTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusUserInApplicationRole userInApplicationRole = new ComPlus.ComPlusUserInApplicationRole();
+
+                userInApplicationRole.Id = (string)row[0];
+                userInApplicationRole.ApplicationRole = (string)row[1];
+                userInApplicationRole.User = (string)row[3];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(userInApplicationRole);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusGroupInApplicationRole table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusGroupInApplicationRoleTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusGroupInApplicationRole groupInApplicationRole = new ComPlus.ComPlusGroupInApplicationRole();
+
+                groupInApplicationRole.Id = (string)row[0];
+                groupInApplicationRole.ApplicationRole = (string)row[1];
+                groupInApplicationRole.Group = (string)row[3];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(groupInApplicationRole);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusAssembly table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusAssemblyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusAssembly assembly = new ComPlus.ComPlusAssembly();
+
+                assembly.Id = (string)row[0];
+                assembly.Application = (string)row[1];
+
+                if (null != row[3])
+                {
+                    assembly.AssemblyName = (string)row[3];
+                }
+
+                if (null != row[4])
+                {
+                    assembly.DllPath = (string)row[4];
+                }
+
+                if (null != row[5])
+                {
+                    assembly.TlbPath = (string)row[5];
+                }
+
+                if (null != row[6])
+                {
+                    assembly.PSDllPath = (string)row[6];
+                }
+
+                int attributes = (int)row[7];
+
+                if (0 != (attributes & (int)ComPlusCompiler.CpiAssemblyAttributes.EventClass))
+                {
+                    assembly.EventClass = ComPlus.YesNoType.yes;
+                }
+
+                if (0 != (attributes & (int)ComPlusCompiler.CpiAssemblyAttributes.DotNetAssembly))
+                {
+                    assembly.Type = ComPlus.ComPlusAssembly.TypeType.net;
+                }
+
+                if (0 != (attributes & (int)ComPlusCompiler.CpiAssemblyAttributes.DllPathFromGAC))
+                {
+                    assembly.DllPathFromGAC = ComPlus.YesNoType.yes;
+                }
+
+                if (0 != (attributes & (int)ComPlusCompiler.CpiAssemblyAttributes.RegisterInCommit))
+                {
+                    assembly.RegisterInCommit = ComPlus.YesNoType.yes;
+                }
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(assembly);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+                this.Core.IndexElement(row, assembly);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusAssemblyDependency table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusAssemblyDependencyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusAssemblyDependency assemblyDependency = new ComPlus.ComPlusAssemblyDependency();
+
+                assemblyDependency.RequiredAssembly = (string)row[1];
+
+                ComPlus.ComPlusAssembly assembly = (ComPlus.ComPlusAssembly)this.Core.GetIndexedElement("ComPlusAssembly", (string)row[0]);
+                if (null != assembly)
+                {
+                    assembly.AddChild(assemblyDependency);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Assembly_", (string)row[0], "ComPlusAssembly"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusComponent table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusComponentTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusComponent comPlusComponent = new ComPlus.ComPlusComponent();
+
+                comPlusComponent.Id = (string)row[0];
+
+                try
+                {
+                    Guid clsid = new Guid((string)row[2]);
+                    comPlusComponent.CLSID = clsid.ToString().ToUpper();
+                }
+                catch
+                {
+                    // TODO: Warning
+                }
+
+                ComPlus.ComPlusAssembly assembly = (ComPlus.ComPlusAssembly)this.Core.GetIndexedElement("ComPlusAssembly", (string)row[1]);
+                if (null != assembly)
+                {
+                    assembly.AddChild(comPlusComponent);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Assembly_", (string)row[1], "ComPlusAssembly"));
+                }
+                this.Core.IndexElement(row, comPlusComponent);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusComponentProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusComponentPropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusComponent comPlusComponent = (ComPlus.ComPlusComponent)this.Core.GetIndexedElement("ComPlusComponent", (string)row[0]);
+                if (null == comPlusComponent)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ComPlusComponent_", (string)row[0], "ComPlusComponent"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "AllowInprocSubscribers":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.AllowInprocSubscribers = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.AllowInprocSubscribers = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ComponentAccessChecksEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.ComponentAccessChecksEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.ComponentAccessChecksEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ComponentTransactionTimeout":
+                        int componentTransactionTimeout;
+                        if (Int32.TryParse((string)row[2], out componentTransactionTimeout))
+                        {
+                            comPlusComponent.ComponentTransactionTimeout = componentTransactionTimeout;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "ComponentTransactionTimeoutEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.ComponentTransactionTimeoutEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.ComponentTransactionTimeoutEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "COMTIIntrinsics":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.COMTIIntrinsics = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.COMTIIntrinsics = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ConstructionEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.ConstructionEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.ConstructionEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ConstructorString":
+                        comPlusComponent.ConstructorString = (string)row[2];
+                        break;
+                    case "CreationTimeout":
+                        int creationTimeout;
+                        if (Int32.TryParse((string)row[2], out creationTimeout))
+                        {
+                            comPlusComponent.CreationTimeout = creationTimeout;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "Description":
+                        comPlusComponent.Description = (string)row[2];
+                        break;
+                    case "EventTrackingEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.EventTrackingEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.EventTrackingEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ExceptionClass":
+                        comPlusComponent.ExceptionClass = (string)row[2];
+                        break;
+                    case "FireInParallel":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.FireInParallel = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.FireInParallel = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "IISIntrinsics":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.IISIntrinsics = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.IISIntrinsics = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "InitializesServerApplication":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.InitializesServerApplication = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.InitializesServerApplication = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "IsEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.IsEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.IsEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "IsPrivateComponent":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.IsPrivateComponent = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.IsPrivateComponent = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "JustInTimeActivation":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.JustInTimeActivation = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.JustInTimeActivation = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "LoadBalancingSupported":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.LoadBalancingSupported = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.LoadBalancingSupported = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "MaxPoolSize":
+                        int maxPoolSize;
+                        if (Int32.TryParse((string)row[2], out maxPoolSize))
+                        {
+                            comPlusComponent.MaxPoolSize = maxPoolSize;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "MinPoolSize":
+                        int minPoolSize;
+                        if (Int32.TryParse((string)row[2], out minPoolSize))
+                        {
+                            comPlusComponent.MinPoolSize = minPoolSize;
+                        }
+                        else
+                        {
+                            // TODO: Warning
+                        }
+                        break;
+                    case "MultiInterfacePublisherFilterCLSID":
+                        comPlusComponent.MultiInterfacePublisherFilterCLSID = (string)row[2];
+                        break;
+                    case "MustRunInClientContext":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.MustRunInClientContext = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.MustRunInClientContext = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "MustRunInDefaultContext":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.MustRunInDefaultContext = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.MustRunInDefaultContext = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "ObjectPoolingEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusComponent.ObjectPoolingEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusComponent.ObjectPoolingEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "PublisherID":
+                        comPlusComponent.PublisherID = (string)row[2];
+                        break;
+                    case "SoapAssemblyName":
+                        comPlusComponent.SoapAssemblyName = (string)row[2];
+                        break;
+                    case "SoapTypeName":
+                        comPlusComponent.SoapTypeName = (string)row[2];
+                        break;
+                    case "Synchronization":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                comPlusComponent.Synchronization = ComPlus.ComPlusComponent.SynchronizationType.ignored;
+                                break;
+                            case "1":
+                                comPlusComponent.Synchronization = ComPlus.ComPlusComponent.SynchronizationType.none;
+                                break;
+                            case "2":
+                                comPlusComponent.Synchronization = ComPlus.ComPlusComponent.SynchronizationType.supported;
+                                break;
+                            case "3":
+                                comPlusComponent.Synchronization = ComPlus.ComPlusComponent.SynchronizationType.required;
+                                break;
+                            case "4":
+                                comPlusComponent.Synchronization = ComPlus.ComPlusComponent.SynchronizationType.requiresNew;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Transaction":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                comPlusComponent.Transaction = ComPlus.ComPlusComponent.TransactionType.ignored;
+                                break;
+                            case "1":
+                                comPlusComponent.Transaction = ComPlus.ComPlusComponent.TransactionType.none;
+                                break;
+                            case "2":
+                                comPlusComponent.Transaction = ComPlus.ComPlusComponent.TransactionType.supported;
+                                break;
+                            case "3":
+                                comPlusComponent.Transaction = ComPlus.ComPlusComponent.TransactionType.required;
+                                break;
+                            case "4":
+                                comPlusComponent.Transaction = ComPlus.ComPlusComponent.TransactionType.requiresNew;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "TxIsolationLevel":
+                        switch ((string)row[2])
+                        {
+                            case "0":
+                                comPlusComponent.TxIsolationLevel = ComPlus.ComPlusComponent.TxIsolationLevelType.any;
+                                break;
+                            case "1":
+                                comPlusComponent.TxIsolationLevel = ComPlus.ComPlusComponent.TxIsolationLevelType.readUnCommitted;
+                                break;
+                            case "2":
+                                comPlusComponent.TxIsolationLevel = ComPlus.ComPlusComponent.TxIsolationLevelType.readCommitted;
+                                break;
+                            case "3":
+                                comPlusComponent.TxIsolationLevel = ComPlus.ComPlusComponent.TxIsolationLevelType.repeatableRead;
+                                break;
+                            case "4":
+                                comPlusComponent.TxIsolationLevel = ComPlus.ComPlusComponent.TxIsolationLevelType.serializable;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusRoleForComponent table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusRoleForComponentTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusRoleForComponent roleForComponent = new ComPlus.ComPlusRoleForComponent();
+
+                roleForComponent.Id = (string)row[0];
+                roleForComponent.Component = (string)row[1];
+                roleForComponent.ApplicationRole = (string)row[2];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[3]);
+                if (null != component)
+                {
+                    component.AddChild(roleForComponent);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[3], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusInterface table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusInterfaceTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusInterface comPlusInterface = new ComPlus.ComPlusInterface();
+
+                comPlusInterface.Id = (string)row[0];
+
+                try
+                {
+                    Guid iid = new Guid((string)row[2]);
+                    comPlusInterface.IID = iid.ToString().ToUpper();
+                }
+                catch
+                {
+                    // TODO: Warning
+                }
+
+                ComPlus.ComPlusComponent comPlusComponent = (ComPlus.ComPlusComponent)this.Core.GetIndexedElement("ComPlusComponent", (string)row[1]);
+                if (null != comPlusComponent)
+                {
+                    comPlusComponent.AddChild(comPlusInterface);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "ComPlusComponent_", (string)row[1], "ComPlusComponent"));
+                }
+                this.Core.IndexElement(row, comPlusInterface);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusInterfaceProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusInterfacePropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusInterface comPlusInterface = (ComPlus.ComPlusInterface)this.Core.GetIndexedElement("ComPlusInterface", (string)row[0]);
+                if (null == comPlusInterface)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Interface_", (string)row[0], "ComPlusInterface"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "Description":
+                        comPlusInterface.Description = (string)row[2];
+                        break;
+                    case "QueuingEnabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusInterface.QueuingEnabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusInterface.QueuingEnabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusRoleForInterface table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusRoleForInterfaceTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusRoleForInterface roleForInterface = new ComPlus.ComPlusRoleForInterface();
+
+                roleForInterface.Id = (string)row[0];
+                roleForInterface.Interface = (string)row[1];
+                roleForInterface.ApplicationRole = (string)row[2];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[3]);
+                if (null != component)
+                {
+                    component.AddChild(roleForInterface);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[3], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusMethod table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusMethodTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusMethod comPlusMethod = new ComPlus.ComPlusMethod();
+
+                comPlusMethod.Id = (string)row[0];
+
+                if (null != row[2])
+                {
+                    comPlusMethod.Index = (int)row[2];
+                }
+
+                if (null != row[3])
+                {
+                    comPlusMethod.Name = (string)row[3];
+                }
+
+                ComPlus.ComPlusInterface comPlusInterface = (ComPlus.ComPlusInterface)this.Core.GetIndexedElement("ComPlusInterface", (string)row[1]);
+                if (null != comPlusInterface)
+                {
+                    comPlusInterface.AddChild(comPlusMethod);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Interface_", (string)row[1], "ComPlusInterface"));
+                }
+                this.Core.IndexElement(row, comPlusMethod);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusMethodProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusMethodPropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusMethod comPlusMethod = (ComPlus.ComPlusMethod)this.Core.GetIndexedElement("ComPlusMethod", (string)row[0]);
+                if (null == comPlusMethod)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Method_", (string)row[0], "ComPlusMethod"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "AutoComplete":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                comPlusMethod.AutoComplete = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                comPlusMethod.AutoComplete = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Description":
+                        comPlusMethod.Description = (string)row[2];
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusRoleForMethod table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusRoleForMethodTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusRoleForMethod roleForMethod = new ComPlus.ComPlusRoleForMethod();
+
+                roleForMethod.Id = (string)row[0];
+                roleForMethod.Method = (string)row[1];
+                roleForMethod.ApplicationRole = (string)row[2];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[3]);
+                if (null != component)
+                {
+                    component.AddChild(roleForMethod);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[3], "Component"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusSubscription table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusSubscriptionTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusSubscription subscription = new ComPlus.ComPlusSubscription();
+
+                subscription.Id = (string)row[0];
+                subscription.Component = (string)row[1];
+                subscription.SubscriptionId = (string)row[3];
+                subscription.Name = (string)row[4];
+                subscription.EventCLSID = (string)row[5];
+                subscription.PublisherID = (string)row[6];
+
+                Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[2]);
+                if (null != component)
+                {
+                    component.AddChild(subscription);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component_", (string)row[2], "Component"));
+                }
+                this.Core.IndexElement(row, subscription);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the ComPlusSubscriptionProperty table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileComPlusSubscriptionPropertyTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                ComPlus.ComPlusSubscription subscription = (ComPlus.ComPlusSubscription)this.Core.GetIndexedElement("ComPlusSubscription", (string)row[0]);
+                if (null == subscription)
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Subscription_", (string)row[0], "ComPlusSubscription"));
+                }
+
+                switch ((string)row[1])
+                {
+                    case "Description":
+                        subscription.Description = (string)row[2];
+                        break;
+                    case "Enabled":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                subscription.Enabled = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                subscription.Enabled = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "EventClassPartitionID":
+                        subscription.EventClassPartitionID = (string)row[2];
+                        break;
+                    case "FilterCriteria":
+                        subscription.FilterCriteria = (string)row[2];
+                        break;
+                    case "InterfaceID":
+                        subscription.InterfaceID = (string)row[2];
+                        break;
+                    case "MachineName":
+                        subscription.MachineName = (string)row[2];
+                        break;
+                    case "MethodName":
+                        subscription.MethodName = (string)row[2];
+                        break;
+                    case "PerUser":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                subscription.PerUser = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                subscription.PerUser = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "Queued":
+                        switch ((string)row[2])
+                        {
+                            case "1":
+                                subscription.Queued = ComPlus.YesNoType.yes;
+                                break;
+                            case "0":
+                                subscription.Queued = ComPlus.YesNoType.no;
+                                break;
+                            default:
+                                // TODO: Warning
+                                break;
+                        }
+                        break;
+                    case "SubscriberMoniker":
+                        subscription.SubscriberMoniker = (string)row[2];
+                        break;
+                    case "UserName":
+                        subscription.UserName = (string)row[2];
+                        break;
+                    default:
+                        // TODO: Warning
+                        break;
+                }
+            }
+        }
+    }
+#endif
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusErrors.cs b/src/ext/ComPlus/wixext/ComPlusErrors.cs
new file mode 100644
index 00000000..91b41679
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusErrors.cs
@@ -0,0 +1,72 @@
+// 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.ComPlus
+{
+    using System;
+    using System.Resources;
+    using WixToolset.Data;
+
+    public static class ComPlusErrors
+    {
+        public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a component as an ancestor. A {0} that does not have a component ancestor is not installed.", elementName, attributeName);
+        }
+
+        public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a component as an ancestor. A {0} that does not have a component ancestor is not installed.", elementName);
+        }
+
+        public static Message RequiredAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2)
+        {
+            return Message(sourceLineNumbers, Ids.RequiredAttribute, "A {0} element must have either a {1} attribute or a {2} attribute, or both set.", elementName, attributeName1, attributeName2);
+        }
+
+        public static Message RequiredAttributeNotUnderComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2)
+        {
+            return Message(sourceLineNumbers, Ids.RequiredAttributeNotUnderComponent, "A {0} element not nested under a component must have either a {1} attribute or a {2} attribute, or both set.", elementName, attributeName1, attributeName2);
+        }
+
+        public static Message RequiredAttributeUnderComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.RequiredAttributeUnderComponent, "The {0}/@{1} attribute must be provided when {0} element is nested under a component.", elementName, attributeName);
+        }
+
+        public static Message UnexpectedAttributeWithOtherValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName, string otherValue)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedAttributeWithOtherValue, "The {0}/@{1} attribute cannot coexist with the {2} attribute's value of '{3}'.", elementName, attributeName, otherAttributeName, otherValue);
+        }
+
+        public static Message UnexpectedAttributeWithOtherValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string otherAttributeName, string otherValue)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedAttributeWithOtherValue, "The {0}/@{1} attribute's value, '{2}', cannot coexist with the {3} attribute's value of '{4}'.", elementName, attributeName, value, otherAttributeName, otherValue);
+        }
+
+        public static Message UnexpectedAttributeWithoutOtherValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName, string otherValue)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedAttributeWithoutOtherValue, "The {0}/@{1} cannot be provided unless the {2} attribute is provided with a value of '{3}'.", elementName, attributeName, otherAttributeName, otherValue);
+        }
+
+        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
+        {
+            return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
+        }
+
+        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args)
+        {
+            return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args);
+        }
+
+        public enum Ids
+        {
+            IllegalAttributeWithoutComponent = 6000,
+            IllegalElementWithoutComponent = 6001,
+            UnexpectedAttributeWithOtherValue = 6002,
+            UnexpectedAttributeWithoutOtherValue = 6003,
+            RequiredAttributeUnderComponent = 6004,
+            RequiredAttribute = 6005,
+            RequiredAttributeNotUnderComponent = 6006,
+        }
+    }
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusExtensionData.cs b/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
new file mode 100644
index 00000000..9cd5341e
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
@@ -0,0 +1,30 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// The WiX Toolset COM+ Extension.
+    /// </summary>
+    public sealed class ComPlusExtensionData : BaseExtensionData
+    {
+        /// <summary>
+        /// Gets the default culture.
+        /// </summary>
+        /// <value>The default culture.</value>
+        public override string DefaultCulture => "en-US";
+
+        public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
+        {
+            symbolDefinition = ComPlusSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
+        }
+
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
+        {
+            return Intermediate.Load(typeof(ComPlusExtensionData).Assembly, "WixToolset.ComPlus.complus.wixlib", symbolDefinitions);
+        }
+    }
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusExtensionFactory.cs b/src/ext/ComPlus/wixext/ComPlusExtensionFactory.cs
new file mode 100644
index 00000000..76b51bff
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusExtensionFactory.cs
@@ -0,0 +1,18 @@
+// 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.ComPlus
+{
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Extensibility;
+
+    public class ComPlusExtensionFactory : BaseExtensionFactory
+    {
+        protected override IReadOnlyCollection<Type> ExtensionTypes => new[]
+        {
+            typeof(ComPlusCompiler),
+            typeof(ComPlusExtensionData),
+            typeof(ComPlusWindowsInstallerBackendBinderExtension),
+        };
+    }
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs b/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs
new file mode 100644
index 00000000..565e1d44
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs
@@ -0,0 +1,360 @@
+// 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.ComPlus
+{
+    using WixToolset.Data.WindowsInstaller;
+
+    public static class ComPlusTableDefinitions
+    {
+        public static readonly TableDefinition ComPlusPartition = new TableDefinition(
+            "ComPlusPartition",
+            ComPlusSymbolDefinitions.ComPlusPartition,
+            new[]
+            {
+                new ColumnDefinition("Partition", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition(
+            "ComPlusPartitionProperty",
+            ComPlusSymbolDefinitions.ComPlusPartitionProperty,
+            new[]
+            {
+                new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition(
+            "ComPlusPartitionRole",
+            ComPlusSymbolDefinitions.ComPlusPartitionRole,
+            new[]
+            {
+                new ColumnDefinition("PartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition(
+            "ComPlusUserInPartitionRole",
+            ComPlusSymbolDefinitions.ComPlusUserInPartitionRole,
+            new[]
+            {
+                new ColumnDefinition("UserInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("PartitionRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartitionRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition(
+            "ComPlusGroupInPartitionRole",
+            ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole,
+            new[]
+            {
+                new ColumnDefinition("GroupInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("PartitionRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartitionRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition(
+            "ComPlusPartitionUser",
+            ComPlusSymbolDefinitions.ComPlusPartitionUser,
+            new[]
+            {
+                new ColumnDefinition("PartitionUser", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusApplication = new TableDefinition(
+            "ComPlusApplication",
+            ComPlusSymbolDefinitions.ComPlusApplication,
+            new[]
+            {
+                new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition(
+            "ComPlusApplicationProperty",
+            ComPlusSymbolDefinitions.ComPlusApplicationProperty,
+            new[]
+            {
+                new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition(
+            "ComPlusApplicationRole",
+            ComPlusSymbolDefinitions.ComPlusApplicationRole,
+            new[]
+            {
+                new ColumnDefinition("ApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition(
+            "ComPlusApplicationRoleProperty",
+            ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty,
+            new[]
+            {
+                new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition(
+            "ComPlusUserInApplicationRole",
+            ComPlusSymbolDefinitions.ComPlusUserInApplicationRole,
+            new[]
+            {
+                new ColumnDefinition("UserInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition(
+            "ComPlusGroupInApplicationRole",
+            ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole,
+            new[]
+            {
+                new ColumnDefinition("GroupInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusAssembly = new TableDefinition(
+            "ComPlusAssembly",
+            ComPlusSymbolDefinitions.ComPlusAssembly,
+            new[]
+            {
+                new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("AssemblyName", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("DllPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("TlbPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("PSDllPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition(
+            "ComPlusAssemblyDependency",
+            ComPlusSymbolDefinitions.ComPlusAssemblyDependency,
+            new[]
+            {
+                new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("RequiredAssembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusComponent = new TableDefinition(
+            "ComPlusComponent",
+            ComPlusSymbolDefinitions.ComPlusComponent,
+            new[]
+            {
+                new ColumnDefinition("ComPlusComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("CLSID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition(
+            "ComPlusComponentProperty",
+            ComPlusSymbolDefinitions.ComPlusComponentProperty,
+            new[]
+            {
+                new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition(
+            "ComPlusRoleForComponent",
+            ComPlusSymbolDefinitions.ComPlusRoleForComponent,
+            new[]
+            {
+                new ColumnDefinition("RoleForComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusInterface = new TableDefinition(
+            "ComPlusInterface",
+            ComPlusSymbolDefinitions.ComPlusInterface,
+            new[]
+            {
+                new ColumnDefinition("Interface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("IID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition(
+            "ComPlusInterfaceProperty",
+            ComPlusSymbolDefinitions.ComPlusInterfaceProperty,
+            new[]
+            {
+                new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition(
+            "ComPlusRoleForInterface",
+            ComPlusSymbolDefinitions.ComPlusRoleForInterface,
+            new[]
+            {
+                new ColumnDefinition("RoleForInterface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusMethod = new TableDefinition(
+            "ComPlusMethod",
+            ComPlusSymbolDefinitions.ComPlusMethod,
+            new[]
+            {
+                new ColumnDefinition("Method", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Index", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
+                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition(
+            "ComPlusMethodProperty",
+            ComPlusSymbolDefinitions.ComPlusMethodProperty,
+            new[]
+            {
+                new ColumnDefinition("Method_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusMethod", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition(
+            "ComPlusRoleForMethod",
+            ComPlusSymbolDefinitions.ComPlusRoleForMethod,
+            new[]
+            {
+                new ColumnDefinition("RoleForMethod", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Method_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusMethod", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition ComPlusSubscription = new TableDefinition(
+            "ComPlusSubscription",
+            ComPlusSymbolDefinitions.ComPlusSubscription,
+            new[]
+            {
+                new ColumnDefinition("Subscription", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("EventCLSID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("PublisherID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition(
+            "ComPlusSubscriptionProperty",
+            ComPlusSymbolDefinitions.ComPlusSubscriptionProperty,
+            new[]
+            {
+                new ColumnDefinition("Subscription_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusSubscription", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+                new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
+        public static readonly TableDefinition[] All = new[]
+        {
+            ComPlusPartition,
+            ComPlusPartitionProperty,
+            ComPlusPartitionRole,
+            ComPlusUserInPartitionRole,
+            ComPlusGroupInPartitionRole,
+            ComPlusPartitionUser,
+            ComPlusApplication,
+            ComPlusApplicationProperty,
+            ComPlusApplicationRole,
+            ComPlusApplicationRoleProperty,
+            ComPlusUserInApplicationRole,
+            ComPlusGroupInApplicationRole,
+            ComPlusAssembly,
+            ComPlusAssemblyDependency,
+            ComPlusComponent,
+            ComPlusComponentProperty,
+            ComPlusRoleForComponent,
+            ComPlusInterface,
+            ComPlusInterfaceProperty,
+            ComPlusRoleForInterface,
+            ComPlusMethod,
+            ComPlusMethodProperty,
+            ComPlusRoleForMethod,
+            ComPlusSubscription,
+            ComPlusSubscriptionProperty,
+        };
+    }
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusWarnings.cs b/src/ext/ComPlus/wixext/ComPlusWarnings.cs
new file mode 100644
index 00000000..e0000918
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusWarnings.cs
@@ -0,0 +1,31 @@
+// 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.ComPlus
+{
+    using System;
+    using System.Resources;
+    using WixToolset.Data;
+
+    public static class ComPlusWarnings
+    {
+        public static Message MissingComponents(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MissingComponents, "The ComPlusAssembly element has a Type attribute with a value of 'native', but the element does not contain any ComPlusComponent elements. All components contained in a native assembly must be listed, or they will not be correctly removed during uninstall.");
+        }
+
+        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
+        {
+            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
+        }
+
+        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args)
+        {
+            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args);
+        }
+
+        public enum Ids
+        {
+            MissingComponents = 6007,
+        }
+    }
+}
diff --git a/src/ext/ComPlus/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs b/src/ext/ComPlus/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs
new file mode 100644
index 00000000..cf226a3d
--- /dev/null
+++ b/src/ext/ComPlus/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs
@@ -0,0 +1,13 @@
+// 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.ComPlus
+{
+    using System.Collections.Generic;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility;
+
+    public class ComPlusWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
+    {
+        public override IReadOnlyCollection<TableDefinition> TableDefinitions => ComPlusTableDefinitions.All;
+    }
+}
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationPropertySymbol.cs
new file mode 100644
index 00000000..6d1e2d28
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationPropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusApplicationProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusApplicationProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationPropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationPropertySymbolFields
+    {
+        ApplicationRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusApplicationPropertySymbol : IntermediateSymbol
+    {
+        public ComPlusApplicationPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationProperty, null, null)
+        {
+        }
+
+        public ComPlusApplicationPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationPropertySymbolFields index] => this.Fields[(int)index];
+
+        public string ApplicationRef
+        {
+            get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)ComPlusApplicationPropertySymbolFields.ApplicationRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationPropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusApplicationPropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusApplicationPropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs
new file mode 100644
index 00000000..3b957899
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusApplicationRoleProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusApplicationRoleProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationRolePropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationRolePropertySymbolFields
+    {
+        ApplicationRoleRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusApplicationRolePropertySymbol : IntermediateSymbol
+    {
+        public ComPlusApplicationRolePropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, null, null)
+        {
+        }
+
+        public ComPlusApplicationRolePropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationRolePropertySymbolFields index] => this.Fields[(int)index];
+
+        public string ApplicationRoleRef
+        {
+            get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef].AsString();
+            set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.ApplicationRoleRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusApplicationRolePropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusApplicationRolePropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRoleSymbol.cs
new file mode 100644
index 00000000..84028ee3
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRoleSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusApplicationRole = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusApplicationRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleSymbolFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationRoleSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationRoleSymbolFields
+    {
+        ApplicationRef,
+        ComponentRef,
+        Name,
+    }
+
+    public class ComPlusApplicationRoleSymbol : IntermediateSymbol
+    {
+        public ComPlusApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusApplicationRole, null, null)
+        {
+        }
+
+        public ComPlusApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplicationRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationRoleSymbolFields index] => this.Fields[(int)index];
+
+        public string ApplicationRef
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)ComPlusApplicationRoleSymbolFields.ApplicationRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusApplicationRoleSymbolFields.ComponentRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleSymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationRoleSymbolFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationSymbol.cs
new file mode 100644
index 00000000..ce541e43
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationSymbol.cs
@@ -0,0 +1,71 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusApplication = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusApplication.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.PartitionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.ApplicationId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationSymbolFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationSymbolFields
+    {
+        PartitionRef,
+        ComponentRef,
+        ApplicationId,
+        Name,
+    }
+
+    public class ComPlusApplicationSymbol : IntermediateSymbol
+    {
+        public ComPlusApplicationSymbol() : base(ComPlusSymbolDefinitions.ComPlusApplication, null, null)
+        {
+        }
+
+        public ComPlusApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusApplication, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationSymbolFields index] => this.Fields[(int)index];
+
+        public string PartitionRef
+        {
+            get => this.Fields[(int)ComPlusApplicationSymbolFields.PartitionRef].AsString();
+            set => this.Set((int)ComPlusApplicationSymbolFields.PartitionRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusApplicationSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusApplicationSymbolFields.ComponentRef, value);
+        }
+
+        public string ApplicationId
+        {
+            get => this.Fields[(int)ComPlusApplicationSymbolFields.ApplicationId].AsString();
+            set => this.Set((int)ComPlusApplicationSymbolFields.ApplicationId, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationSymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationSymbolFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs
new file mode 100644
index 00000000..549d53e4
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs
@@ -0,0 +1,55 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusAssemblyDependency = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusAssemblyDependency.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencySymbolFields.AssemblyRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusAssemblyDependencySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusAssemblyDependencySymbolFields
+    {
+        AssemblyRef,
+        RequiredAssemblyRef,
+    }
+
+    public class ComPlusAssemblyDependencySymbol : IntermediateSymbol
+    {
+        public ComPlusAssemblyDependencySymbol() : base(ComPlusSymbolDefinitions.ComPlusAssemblyDependency, null, null)
+        {
+        }
+
+        public ComPlusAssemblyDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusAssemblyDependency, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusAssemblyDependencySymbolFields index] => this.Fields[(int)index];
+
+        public string AssemblyRef
+        {
+            get => this.Fields[(int)ComPlusAssemblyDependencySymbolFields.AssemblyRef].AsString();
+            set => this.Set((int)ComPlusAssemblyDependencySymbolFields.AssemblyRef, value);
+        }
+
+        public string RequiredAssemblyRef
+        {
+            get => this.Fields[(int)ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef].AsString();
+            set => this.Set((int)ComPlusAssemblyDependencySymbolFields.RequiredAssemblyRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblySymbol.cs
new file mode 100644
index 00000000..1329df30
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblySymbol.cs
@@ -0,0 +1,95 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusAssembly = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusAssembly.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.AssemblyName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.DllPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.TlbPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.PSDllPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblySymbolFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(ComPlusAssemblySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusAssemblySymbolFields
+    {
+        ApplicationRef,
+        ComponentRef,
+        AssemblyName,
+        DllPath,
+        TlbPath,
+        PSDllPath,
+        Attributes,
+    }
+
+    public class ComPlusAssemblySymbol : IntermediateSymbol
+    {
+        public ComPlusAssemblySymbol() : base(ComPlusSymbolDefinitions.ComPlusAssembly, null, null)
+        {
+        }
+
+        public ComPlusAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusAssembly, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusAssemblySymbolFields index] => this.Fields[(int)index];
+
+        public string ApplicationRef
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)ComPlusAssemblySymbolFields.ApplicationRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusAssemblySymbolFields.ComponentRef, value);
+        }
+
+        public string AssemblyName
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.AssemblyName].AsString();
+            set => this.Set((int)ComPlusAssemblySymbolFields.AssemblyName, value);
+        }
+
+        public string DllPath
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.DllPath].AsString();
+            set => this.Set((int)ComPlusAssemblySymbolFields.DllPath, value);
+        }
+
+        public string TlbPath
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.TlbPath].AsString();
+            set => this.Set((int)ComPlusAssemblySymbolFields.TlbPath, value);
+        }
+
+        public string PSDllPath
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.PSDllPath].AsString();
+            set => this.Set((int)ComPlusAssemblySymbolFields.PSDllPath, value);
+        }
+
+        public int Attributes
+        {
+            get => this.Fields[(int)ComPlusAssemblySymbolFields.Attributes].AsNumber();
+            set => this.Set((int)ComPlusAssemblySymbolFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusComponentPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentPropertySymbol.cs
new file mode 100644
index 00000000..b1d85b60
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentPropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusComponentProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusComponentProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentPropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusComponentPropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusComponentPropertySymbolFields
+    {
+        ComPlusComponentRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusComponentPropertySymbol : IntermediateSymbol
+    {
+        public ComPlusComponentPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusComponentProperty, null, null)
+        {
+        }
+
+        public ComPlusComponentPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusComponentProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusComponentPropertySymbolFields index] => this.Fields[(int)index];
+
+        public string ComPlusComponentRef
+        {
+            get => this.Fields[(int)ComPlusComponentPropertySymbolFields.ComPlusComponentRef].AsString();
+            set => this.Set((int)ComPlusComponentPropertySymbolFields.ComPlusComponentRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusComponentPropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusComponentPropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusComponentPropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusComponentPropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusComponentSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentSymbol.cs
new file mode 100644
index 00000000..020b754c
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentSymbol.cs
@@ -0,0 +1,55 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusComponent = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusComponent.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusComponentSymbolFields.AssemblyRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentSymbolFields.CLSID), IntermediateFieldType.String),
+            },
+            typeof(ComPlusComponentSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusComponentSymbolFields
+    {
+        AssemblyRef,
+        CLSID,
+    }
+
+    public class ComPlusComponentSymbol : IntermediateSymbol
+    {
+        public ComPlusComponentSymbol() : base(ComPlusSymbolDefinitions.ComPlusComponent, null, null)
+        {
+        }
+
+        public ComPlusComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusComponentSymbolFields index] => this.Fields[(int)index];
+
+        public string AssemblyRef
+        {
+            get => this.Fields[(int)ComPlusComponentSymbolFields.AssemblyRef].AsString();
+            set => this.Set((int)ComPlusComponentSymbolFields.AssemblyRef, value);
+        }
+
+        public string CLSID
+        {
+            get => this.Fields[(int)ComPlusComponentSymbolFields.CLSID].AsString();
+            set => this.Set((int)ComPlusComponentSymbolFields.CLSID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs
new file mode 100644
index 00000000..d6b91e99
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusGroupInApplicationRole = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusGroupInApplicationRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleSymbolFields.GroupRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusGroupInApplicationRoleSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusGroupInApplicationRoleSymbolFields
+    {
+        ApplicationRoleRef,
+        ComponentRef,
+        GroupRef,
+    }
+
+    public class ComPlusGroupInApplicationRoleSymbol : IntermediateSymbol
+    {
+        public ComPlusGroupInApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, null, null)
+        {
+        }
+
+        public ComPlusGroupInApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusGroupInApplicationRoleSymbolFields index] => this.Fields[(int)index];
+
+        public string ApplicationRoleRef
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.ApplicationRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.ComponentRef, value);
+        }
+
+        public string GroupRef
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleSymbolFields.GroupRef].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleSymbolFields.GroupRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs
new file mode 100644
index 00000000..da70de9f
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusGroupInPartitionRole = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusGroupInPartitionRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleSymbolFields.GroupRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusGroupInPartitionRoleSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusGroupInPartitionRoleSymbolFields
+    {
+        PartitionRoleRef,
+        ComponentRef,
+        GroupRef,
+    }
+
+    public class ComPlusGroupInPartitionRoleSymbol : IntermediateSymbol
+    {
+        public ComPlusGroupInPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, null, null)
+        {
+        }
+
+        public ComPlusGroupInPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusGroupInPartitionRoleSymbolFields index] => this.Fields[(int)index];
+
+        public string PartitionRoleRef
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.PartitionRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.ComponentRef, value);
+        }
+
+        public string GroupRef
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleSymbolFields.GroupRef].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleSymbolFields.GroupRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusInterfacePropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfacePropertySymbol.cs
new file mode 100644
index 00000000..2ed4ce18
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfacePropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusInterfaceProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusInterfaceProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.InterfaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusInterfacePropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusInterfacePropertySymbolFields
+    {
+        InterfaceRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusInterfacePropertySymbol : IntermediateSymbol
+    {
+        public ComPlusInterfacePropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusInterfaceProperty, null, null)
+        {
+        }
+
+        public ComPlusInterfacePropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusInterfaceProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusInterfacePropertySymbolFields index] => this.Fields[(int)index];
+
+        public string InterfaceRef
+        {
+            get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.InterfaceRef].AsString();
+            set => this.Set((int)ComPlusInterfacePropertySymbolFields.InterfaceRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusInterfacePropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusInterfacePropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusInterfacePropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusInterfaceSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfaceSymbol.cs
new file mode 100644
index 00000000..f875b424
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfaceSymbol.cs
@@ -0,0 +1,55 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusInterface = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusInterface.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusInterfaceSymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfaceSymbolFields.IID), IntermediateFieldType.String),
+            },
+            typeof(ComPlusInterfaceSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusInterfaceSymbolFields
+    {
+        ComPlusComponentRef,
+        IID,
+    }
+
+    public class ComPlusInterfaceSymbol : IntermediateSymbol
+    {
+        public ComPlusInterfaceSymbol() : base(ComPlusSymbolDefinitions.ComPlusInterface, null, null)
+        {
+        }
+
+        public ComPlusInterfaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusInterface, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusInterfaceSymbolFields index] => this.Fields[(int)index];
+
+        public string ComPlusComponentRef
+        {
+            get => this.Fields[(int)ComPlusInterfaceSymbolFields.ComPlusComponentRef].AsString();
+            set => this.Set((int)ComPlusInterfaceSymbolFields.ComPlusComponentRef, value);
+        }
+
+        public string IID
+        {
+            get => this.Fields[(int)ComPlusInterfaceSymbolFields.IID].AsString();
+            set => this.Set((int)ComPlusInterfaceSymbolFields.IID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusMethodPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodPropertySymbol.cs
new file mode 100644
index 00000000..65b17ea4
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodPropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusMethodProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusMethodProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.MethodRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodPropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusMethodPropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusMethodPropertySymbolFields
+    {
+        MethodRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusMethodPropertySymbol : IntermediateSymbol
+    {
+        public ComPlusMethodPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusMethodProperty, null, null)
+        {
+        }
+
+        public ComPlusMethodPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusMethodProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusMethodPropertySymbolFields index] => this.Fields[(int)index];
+
+        public string MethodRef
+        {
+            get => this.Fields[(int)ComPlusMethodPropertySymbolFields.MethodRef].AsString();
+            set => this.Set((int)ComPlusMethodPropertySymbolFields.MethodRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusMethodPropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusMethodPropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusMethodPropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusMethodPropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusMethodSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodSymbol.cs
new file mode 100644
index 00000000..9959a56f
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusMethod = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusMethod.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.InterfaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.Index), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodSymbolFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusMethodSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusMethodSymbolFields
+    {
+        InterfaceRef,
+        Index,
+        Name,
+    }
+
+    public class ComPlusMethodSymbol : IntermediateSymbol
+    {
+        public ComPlusMethodSymbol() : base(ComPlusSymbolDefinitions.ComPlusMethod, null, null)
+        {
+        }
+
+        public ComPlusMethodSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusMethod, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusMethodSymbolFields index] => this.Fields[(int)index];
+
+        public string InterfaceRef
+        {
+            get => this.Fields[(int)ComPlusMethodSymbolFields.InterfaceRef].AsString();
+            set => this.Set((int)ComPlusMethodSymbolFields.InterfaceRef, value);
+        }
+
+        public int? Index
+        {
+            get => this.Fields[(int)ComPlusMethodSymbolFields.Index].AsNullableNumber();
+            set => this.Set((int)ComPlusMethodSymbolFields.Index, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusMethodSymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusMethodSymbolFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionPropertySymbol.cs
new file mode 100644
index 00000000..e42feae2
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionPropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusPartitionProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusPartitionProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.PartitionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionPropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionPropertySymbolFields
+    {
+        PartitionRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusPartitionPropertySymbol : IntermediateSymbol
+    {
+        public ComPlusPartitionPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionProperty, null, null)
+        {
+        }
+
+        public ComPlusPartitionPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionPropertySymbolFields index] => this.Fields[(int)index];
+
+        public string PartitionRef
+        {
+            get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.PartitionRef].AsString();
+            set => this.Set((int)ComPlusPartitionPropertySymbolFields.PartitionRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusPartitionPropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusPartitionPropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusPartitionPropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionRoleSymbol.cs
new file mode 100644
index 00000000..23293d93
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionRoleSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusPartitionRole = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusPartitionRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.PartitionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleSymbolFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionRoleSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionRoleSymbolFields
+    {
+        PartitionRef,
+        ComponentRef,
+        Name,
+    }
+
+    public class ComPlusPartitionRoleSymbol : IntermediateSymbol
+    {
+        public ComPlusPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionRole, null, null)
+        {
+        }
+
+        public ComPlusPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionRoleSymbolFields index] => this.Fields[(int)index];
+
+        public string PartitionRef
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.PartitionRef].AsString();
+            set => this.Set((int)ComPlusPartitionRoleSymbolFields.PartitionRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusPartitionRoleSymbolFields.ComponentRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleSymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusPartitionRoleSymbolFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionSymbol.cs
new file mode 100644
index 00000000..c60fca40
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusPartition = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusPartition.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.PartitionId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionSymbolFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionSymbolFields
+    {
+        ComponentRef,
+        PartitionId,
+        Name,
+    }
+
+    public class ComPlusPartitionSymbol : IntermediateSymbol
+    {
+        public ComPlusPartitionSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartition, null, null)
+        {
+        }
+
+        public ComPlusPartitionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartition, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionSymbolFields index] => this.Fields[(int)index];
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusPartitionSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusPartitionSymbolFields.ComponentRef, value);
+        }
+
+        public string PartitionId
+        {
+            get => this.Fields[(int)ComPlusPartitionSymbolFields.PartitionId].AsString();
+            set => this.Set((int)ComPlusPartitionSymbolFields.PartitionId, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusPartitionSymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusPartitionSymbolFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionUserSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionUserSymbol.cs
new file mode 100644
index 00000000..c4d52f54
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionUserSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusPartitionUser = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusPartitionUser.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.PartitionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserSymbolFields.UserRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionUserSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionUserSymbolFields
+    {
+        PartitionRef,
+        ComponentRef,
+        UserRef,
+    }
+
+    public class ComPlusPartitionUserSymbol : IntermediateSymbol
+    {
+        public ComPlusPartitionUserSymbol() : base(ComPlusSymbolDefinitions.ComPlusPartitionUser, null, null)
+        {
+        }
+
+        public ComPlusPartitionUserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusPartitionUser, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionUserSymbolFields index] => this.Fields[(int)index];
+
+        public string PartitionRef
+        {
+            get => this.Fields[(int)ComPlusPartitionUserSymbolFields.PartitionRef].AsString();
+            set => this.Set((int)ComPlusPartitionUserSymbolFields.PartitionRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusPartitionUserSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusPartitionUserSymbolFields.ComponentRef, value);
+        }
+
+        public string UserRef
+        {
+            get => this.Fields[(int)ComPlusPartitionUserSymbolFields.UserRef].AsString();
+            set => this.Set((int)ComPlusPartitionUserSymbolFields.UserRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForComponentSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForComponentSymbol.cs
new file mode 100644
index 00000000..2d9968ee
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForComponentSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusRoleForComponent = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusRoleForComponent.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentSymbolFields.ComponentRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusRoleForComponentSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusRoleForComponentSymbolFields
+    {
+        ComPlusComponentRef,
+        ApplicationRoleRef,
+        ComponentRef,
+    }
+
+    public class ComPlusRoleForComponentSymbol : IntermediateSymbol
+    {
+        public ComPlusRoleForComponentSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForComponent, null, null)
+        {
+        }
+
+        public ComPlusRoleForComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusRoleForComponentSymbolFields index] => this.Fields[(int)index];
+
+        public string ComPlusComponentRef
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ComPlusComponentRef].AsString();
+            set => this.Set((int)ComPlusRoleForComponentSymbolFields.ComPlusComponentRef, value);
+        }
+
+        public string ApplicationRoleRef
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ApplicationRoleRef].AsString();
+            set => this.Set((int)ComPlusRoleForComponentSymbolFields.ApplicationRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusRoleForComponentSymbolFields.ComponentRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs
new file mode 100644
index 00000000..b77bd215
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusRoleForInterface = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusRoleForInterface.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.InterfaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceSymbolFields.ComponentRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusRoleForInterfaceSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusRoleForInterfaceSymbolFields
+    {
+        InterfaceRef,
+        ApplicationRoleRef,
+        ComponentRef,
+    }
+
+    public class ComPlusRoleForInterfaceSymbol : IntermediateSymbol
+    {
+        public ComPlusRoleForInterfaceSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForInterface, null, null)
+        {
+        }
+
+        public ComPlusRoleForInterfaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForInterface, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusRoleForInterfaceSymbolFields index] => this.Fields[(int)index];
+
+        public string InterfaceRef
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.InterfaceRef].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.InterfaceRef, value);
+        }
+
+        public string ApplicationRoleRef
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.ApplicationRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceSymbolFields.ComponentRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForMethodSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForMethodSymbol.cs
new file mode 100644
index 00000000..9ba9d03b
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForMethodSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusRoleForMethod = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusRoleForMethod.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.MethodRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodSymbolFields.ComponentRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusRoleForMethodSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusRoleForMethodSymbolFields
+    {
+        MethodRef,
+        ApplicationRoleRef,
+        ComponentRef,
+    }
+
+    public class ComPlusRoleForMethodSymbol : IntermediateSymbol
+    {
+        public ComPlusRoleForMethodSymbol() : base(ComPlusSymbolDefinitions.ComPlusRoleForMethod, null, null)
+        {
+        }
+
+        public ComPlusRoleForMethodSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusRoleForMethod, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusRoleForMethodSymbolFields index] => this.Fields[(int)index];
+
+        public string MethodRef
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.MethodRef].AsString();
+            set => this.Set((int)ComPlusRoleForMethodSymbolFields.MethodRef, value);
+        }
+
+        public string ApplicationRoleRef
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.ApplicationRoleRef].AsString();
+            set => this.Set((int)ComPlusRoleForMethodSymbolFields.ApplicationRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusRoleForMethodSymbolFields.ComponentRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs
new file mode 100644
index 00000000..af995c3d
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusSubscriptionProperty = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusSubscriptionProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.SubscriptionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertySymbolFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusSubscriptionPropertySymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusSubscriptionPropertySymbolFields
+    {
+        SubscriptionRef,
+        Name,
+        Value,
+    }
+
+    public class ComPlusSubscriptionPropertySymbol : IntermediateSymbol
+    {
+        public ComPlusSubscriptionPropertySymbol() : base(ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, null, null)
+        {
+        }
+
+        public ComPlusSubscriptionPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusSubscriptionPropertySymbolFields index] => this.Fields[(int)index];
+
+        public string SubscriptionRef
+        {
+            get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.SubscriptionRef].AsString();
+            set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.SubscriptionRef, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusSubscriptionPropertySymbolFields.Value].AsString();
+            set => this.Set((int)ComPlusSubscriptionPropertySymbolFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionSymbol.cs
new file mode 100644
index 00000000..24d3f92e
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionSymbol.cs
@@ -0,0 +1,95 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusSubscription = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusSubscription.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.Subscription), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.ComPlusComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.SubscriptionId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.EventCLSID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionSymbolFields.PublisherID), IntermediateFieldType.String),
+            },
+            typeof(ComPlusSubscriptionSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusSubscriptionSymbolFields
+    {
+        Subscription,
+        ComPlusComponentRef,
+        ComponentRef,
+        SubscriptionId,
+        Name,
+        EventCLSID,
+        PublisherID,
+    }
+
+    public class ComPlusSubscriptionSymbol : IntermediateSymbol
+    {
+        public ComPlusSubscriptionSymbol() : base(ComPlusSymbolDefinitions.ComPlusSubscription, null, null)
+        {
+        }
+
+        public ComPlusSubscriptionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusSubscription, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusSubscriptionSymbolFields index] => this.Fields[(int)index];
+
+        public string Subscription
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.Subscription].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.Subscription, value);
+        }
+
+        public string ComPlusComponentRef
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.ComPlusComponentRef].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.ComPlusComponentRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.ComponentRef, value);
+        }
+
+        public string SubscriptionId
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.SubscriptionId].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.SubscriptionId, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.Name].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.Name, value);
+        }
+
+        public string EventCLSID
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.EventCLSID].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.EventCLSID, value);
+        }
+
+        public string PublisherID
+        {
+            get => this.Fields[(int)ComPlusSubscriptionSymbolFields.PublisherID].AsString();
+            set => this.Set((int)ComPlusSubscriptionSymbolFields.PublisherID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusSymbolDefinitions.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusSymbolDefinitions.cs
new file mode 100644
index 00000000..407b9c14
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusSymbolDefinitions.cs
@@ -0,0 +1,135 @@
+// 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.ComPlus
+{
+    using System;
+    using WixToolset.Data;
+
+    public enum ComPlusSymbolDefinitionType
+    {
+        ComPlusApplication,
+        ComPlusApplicationProperty,
+        ComPlusApplicationRole,
+        ComPlusApplicationRoleProperty,
+        ComPlusAssembly,
+        ComPlusAssemblyDependency,
+        ComPlusComponent,
+        ComPlusComponentProperty,
+        ComPlusGroupInApplicationRole,
+        ComPlusGroupInPartitionRole,
+        ComPlusInterface,
+        ComPlusInterfaceProperty,
+        ComPlusMethod,
+        ComPlusMethodProperty,
+        ComPlusPartition,
+        ComPlusPartitionProperty,
+        ComPlusPartitionRole,
+        ComPlusPartitionUser,
+        ComPlusRoleForComponent,
+        ComPlusRoleForInterface,
+        ComPlusRoleForMethod,
+        ComPlusSubscription,
+        ComPlusSubscriptionProperty,
+        ComPlusUserInApplicationRole,
+        ComPlusUserInPartitionRole,
+    }
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly Version Version = new Version("4.0.0");
+
+        public static IntermediateSymbolDefinition ByName(string name)
+        {
+            if (!Enum.TryParse(name, out ComPlusSymbolDefinitionType type))
+            {
+                return null;
+            }
+
+            return ByType(type);
+        }
+
+        public static IntermediateSymbolDefinition ByType(ComPlusSymbolDefinitionType type)
+        {
+            switch (type)
+            {
+                case ComPlusSymbolDefinitionType.ComPlusApplication:
+                    return ComPlusSymbolDefinitions.ComPlusApplication;
+
+                case ComPlusSymbolDefinitionType.ComPlusApplicationProperty:
+                    return ComPlusSymbolDefinitions.ComPlusApplicationProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusApplicationRole:
+                    return ComPlusSymbolDefinitions.ComPlusApplicationRole;
+
+                case ComPlusSymbolDefinitionType.ComPlusApplicationRoleProperty:
+                    return ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusAssembly:
+                    return ComPlusSymbolDefinitions.ComPlusAssembly;
+
+                case ComPlusSymbolDefinitionType.ComPlusAssemblyDependency:
+                    return ComPlusSymbolDefinitions.ComPlusAssemblyDependency;
+
+                case ComPlusSymbolDefinitionType.ComPlusComponent:
+                    return ComPlusSymbolDefinitions.ComPlusComponent;
+
+                case ComPlusSymbolDefinitionType.ComPlusComponentProperty:
+                    return ComPlusSymbolDefinitions.ComPlusComponentProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusGroupInApplicationRole:
+                    return ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole;
+
+                case ComPlusSymbolDefinitionType.ComPlusGroupInPartitionRole:
+                    return ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole;
+
+                case ComPlusSymbolDefinitionType.ComPlusInterface:
+                    return ComPlusSymbolDefinitions.ComPlusInterface;
+
+                case ComPlusSymbolDefinitionType.ComPlusInterfaceProperty:
+                    return ComPlusSymbolDefinitions.ComPlusInterfaceProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusMethod:
+                    return ComPlusSymbolDefinitions.ComPlusMethod;
+
+                case ComPlusSymbolDefinitionType.ComPlusMethodProperty:
+                    return ComPlusSymbolDefinitions.ComPlusMethodProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusPartition:
+                    return ComPlusSymbolDefinitions.ComPlusPartition;
+
+                case ComPlusSymbolDefinitionType.ComPlusPartitionProperty:
+                    return ComPlusSymbolDefinitions.ComPlusPartitionProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusPartitionRole:
+                    return ComPlusSymbolDefinitions.ComPlusPartitionRole;
+
+                case ComPlusSymbolDefinitionType.ComPlusPartitionUser:
+                    return ComPlusSymbolDefinitions.ComPlusPartitionUser;
+
+                case ComPlusSymbolDefinitionType.ComPlusRoleForComponent:
+                    return ComPlusSymbolDefinitions.ComPlusRoleForComponent;
+
+                case ComPlusSymbolDefinitionType.ComPlusRoleForInterface:
+                    return ComPlusSymbolDefinitions.ComPlusRoleForInterface;
+
+                case ComPlusSymbolDefinitionType.ComPlusRoleForMethod:
+                    return ComPlusSymbolDefinitions.ComPlusRoleForMethod;
+
+                case ComPlusSymbolDefinitionType.ComPlusSubscription:
+                    return ComPlusSymbolDefinitions.ComPlusSubscription;
+
+                case ComPlusSymbolDefinitionType.ComPlusSubscriptionProperty:
+                    return ComPlusSymbolDefinitions.ComPlusSubscriptionProperty;
+
+                case ComPlusSymbolDefinitionType.ComPlusUserInApplicationRole:
+                    return ComPlusSymbolDefinitions.ComPlusUserInApplicationRole;
+
+                case ComPlusSymbolDefinitionType.ComPlusUserInPartitionRole:
+                    return ComPlusSymbolDefinitions.ComPlusUserInPartitionRole;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+    }
+}
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs
new file mode 100644
index 00000000..1f2e01b2
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusUserInApplicationRole = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusUserInApplicationRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleSymbolFields.UserRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusUserInApplicationRoleSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusUserInApplicationRoleSymbolFields
+    {
+        ApplicationRoleRef,
+        ComponentRef,
+        UserRef,
+    }
+
+    public class ComPlusUserInApplicationRoleSymbol : IntermediateSymbol
+    {
+        public ComPlusUserInApplicationRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, null, null)
+        {
+        }
+
+        public ComPlusUserInApplicationRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusUserInApplicationRoleSymbolFields index] => this.Fields[(int)index];
+
+        public string ApplicationRoleRef
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.ApplicationRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.ComponentRef, value);
+        }
+
+        public string UserRef
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleSymbolFields.UserRef].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleSymbolFields.UserRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs
new file mode 100644
index 00000000..10df94bf
--- /dev/null
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs
@@ -0,0 +1,63 @@
+// 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.ComPlus
+{
+    using WixToolset.Data;
+    using WixToolset.ComPlus.Symbols;
+
+    public static partial class ComPlusSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition ComPlusUserInPartitionRole = new IntermediateSymbolDefinition(
+            ComPlusSymbolDefinitionType.ComPlusUserInPartitionRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleSymbolFields.UserRef), IntermediateFieldType.String),
+            },
+            typeof(ComPlusUserInPartitionRoleSymbol));
+    }
+}
+
+namespace WixToolset.ComPlus.Symbols
+{
+    using WixToolset.Data;
+
+    public enum ComPlusUserInPartitionRoleSymbolFields
+    {
+        PartitionRoleRef,
+        ComponentRef,
+        UserRef,
+    }
+
+    public class ComPlusUserInPartitionRoleSymbol : IntermediateSymbol
+    {
+        public ComPlusUserInPartitionRoleSymbol() : base(ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, null, null)
+        {
+        }
+
+        public ComPlusUserInPartitionRoleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusUserInPartitionRoleSymbolFields index] => this.Fields[(int)index];
+
+        public string PartitionRoleRef
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.PartitionRoleRef, value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.ComponentRef, value);
+        }
+
+        public string UserRef
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleSymbolFields.UserRef].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleSymbolFields.UserRef, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
new file mode 100644
index 00000000..11271ad3
--- /dev/null
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <RootNamespace>WixToolset.ComPlus</RootNamespace>
+    <Description>WiX Toolset ComPlus Extension</Description>
+    <Title>WiX Toolset ComPlus Extension</Title>
+    <IsTool>true</IsTool>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
new file mode 100644
index 00000000..3197250b
--- /dev/null
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$$id$.targets" target="build" />
+
+    <file src="netstandard2.0\$id$.dll" target="tools" />
+
+    <file src="x86\*.pdb" target="pdbs\x86" />
+    <file src="x64\*.pdb" target="pdbs\x64" />
+  </files>
+</package>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
new file mode 100644
index 00000000..8115b715
--- /dev/null
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixToolsetComPlusWixextPath Condition=" '$(WixToolsetComPlusWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.ComPlus.wixext.dll</WixToolsetComPlusWixextPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <WixExtension Include="$(WixToolsetComPlusWixextPath)" />
+  </ItemGroup>
+</Project>