Integrate into latest v4.

26 files changed, 1886 insertions, 0 deletions

diff --git a/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs b/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs
new file mode 100644
index 00000000..2582d323
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusApplicationPropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusApplicationProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusApplicationProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Application_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationPropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationPropertyTupleFields
+    {
+        Application_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusApplicationPropertyTuple : IntermediateTuple
+    {
+        public ComPlusApplicationPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationProperty, null, null)
+        {
+        }
+
+        public ComPlusApplicationPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Application_
+        {
+            get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Application_].AsString();
+            set => this.Set((int)ComPlusApplicationPropertyTupleFields.Application_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationPropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusApplicationPropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs b/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs
new file mode 100644
index 00000000..98eee7f8
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusApplicationRoleProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.ApplicationRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationRolePropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationRolePropertyTupleFields
+    {
+        ApplicationRole_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusApplicationRolePropertyTuple : IntermediateTuple
+    {
+        public ComPlusApplicationRolePropertyTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, null, null)
+        {
+        }
+
+        public ComPlusApplicationRolePropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationRoleProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationRolePropertyTupleFields index] => this.Fields[(int)index];
+
+        public string ApplicationRole_
+        {
+            get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.ApplicationRole_].AsString();
+            set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.ApplicationRole_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs
new file mode 100644
index 00000000..5a0cf378
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusApplicationRoleTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusApplicationRole = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusApplicationRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ApplicationRole), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Application_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationRoleTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationRoleTupleFields
+    {
+        ApplicationRole,
+        Application_,
+        Component_,
+        Name,
+    }
+
+    public class ComPlusApplicationRoleTuple : IntermediateTuple
+    {
+        public ComPlusApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusApplicationRole, null, null)
+        {
+        }
+
+        public ComPlusApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplicationRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationRoleTupleFields index] => this.Fields[(int)index];
+
+        public string ApplicationRole
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ApplicationRole].AsString();
+            set => this.Set((int)ComPlusApplicationRoleTupleFields.ApplicationRole, value);
+        }
+
+        public string Application_
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Application_].AsString();
+            set => this.Set((int)ComPlusApplicationRoleTupleFields.Application_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusApplicationRoleTupleFields.Component_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationRoleTupleFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusApplicationTuple.cs b/src/wixext/Tuples/ComPlusApplicationTuple.cs
new file mode 100644
index 00000000..7fd5fbd4
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusApplicationTuple.cs
@@ -0,0 +1,79 @@
+// 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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusApplication = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusApplication.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Application), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Partition_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.CustomId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusApplicationTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusApplicationTupleFields
+    {
+        Application,
+        Partition_,
+        Component_,
+        CustomId,
+        Name,
+    }
+
+    public class ComPlusApplicationTuple : IntermediateTuple
+    {
+        public ComPlusApplicationTuple() : base(ComPlusTupleDefinitions.ComPlusApplication, null, null)
+        {
+        }
+
+        public ComPlusApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusApplication, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusApplicationTupleFields index] => this.Fields[(int)index];
+
+        public string Application
+        {
+            get => this.Fields[(int)ComPlusApplicationTupleFields.Application].AsString();
+            set => this.Set((int)ComPlusApplicationTupleFields.Application, value);
+        }
+
+        public string Partition_
+        {
+            get => this.Fields[(int)ComPlusApplicationTupleFields.Partition_].AsString();
+            set => this.Set((int)ComPlusApplicationTupleFields.Partition_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusApplicationTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusApplicationTupleFields.Component_, value);
+        }
+
+        public string CustomId
+        {
+            get => this.Fields[(int)ComPlusApplicationTupleFields.CustomId].AsString();
+            set => this.Set((int)ComPlusApplicationTupleFields.CustomId, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusApplicationTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusApplicationTupleFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs b/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs
new file mode 100644
index 00000000..be0bc073
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusAssemblyDependency = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusAssemblyDependency.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.Assembly_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.RequiredAssembly_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusAssemblyDependencyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusAssemblyDependencyTupleFields
+    {
+        Assembly_,
+        RequiredAssembly_,
+    }
+
+    public class ComPlusAssemblyDependencyTuple : IntermediateTuple
+    {
+        public ComPlusAssemblyDependencyTuple() : base(ComPlusTupleDefinitions.ComPlusAssemblyDependency, null, null)
+        {
+        }
+
+        public ComPlusAssemblyDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusAssemblyDependency, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusAssemblyDependencyTupleFields index] => this.Fields[(int)index];
+
+        public string Assembly_
+        {
+            get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.Assembly_].AsString();
+            set => this.Set((int)ComPlusAssemblyDependencyTupleFields.Assembly_, value);
+        }
+
+        public string RequiredAssembly_
+        {
+            get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.RequiredAssembly_].AsString();
+            set => this.Set((int)ComPlusAssemblyDependencyTupleFields.RequiredAssembly_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusAssemblyTuple.cs b/src/wixext/Tuples/ComPlusAssemblyTuple.cs
new file mode 100644
index 00000000..0330b4e8
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusAssemblyTuple.cs
@@ -0,0 +1,103 @@
+// 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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusAssembly = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusAssembly.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Assembly), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Application_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.AssemblyName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.DllPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.TlbPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.PSDllPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(ComPlusAssemblyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusAssemblyTupleFields
+    {
+        Assembly,
+        Application_,
+        Component_,
+        AssemblyName,
+        DllPath,
+        TlbPath,
+        PSDllPath,
+        Attributes,
+    }
+
+    public class ComPlusAssemblyTuple : IntermediateTuple
+    {
+        public ComPlusAssemblyTuple() : base(ComPlusTupleDefinitions.ComPlusAssembly, null, null)
+        {
+        }
+
+        public ComPlusAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusAssembly, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusAssemblyTupleFields index] => this.Fields[(int)index];
+
+        public string Assembly
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.Assembly].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.Assembly, value);
+        }
+
+        public string Application_
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.Application_].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.Application_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.Component_, value);
+        }
+
+        public string AssemblyName
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.AssemblyName].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.AssemblyName, value);
+        }
+
+        public string DllPath
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.DllPath].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.DllPath, value);
+        }
+
+        public string TlbPath
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.TlbPath].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.TlbPath, value);
+        }
+
+        public string PSDllPath
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.PSDllPath].AsString();
+            set => this.Set((int)ComPlusAssemblyTupleFields.PSDllPath, value);
+        }
+
+        public int Attributes
+        {
+            get => this.Fields[(int)ComPlusAssemblyTupleFields.Attributes].AsNumber();
+            set => this.Set((int)ComPlusAssemblyTupleFields.Attributes, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs b/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs
new file mode 100644
index 00000000..81651343
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusComponentPropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusComponentProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusComponentProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.ComPlusComponent_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusComponentPropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusComponentPropertyTupleFields
+    {
+        ComPlusComponent_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusComponentPropertyTuple : IntermediateTuple
+    {
+        public ComPlusComponentPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusComponentProperty, null, null)
+        {
+        }
+
+        public ComPlusComponentPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusComponentProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusComponentPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string ComPlusComponent_
+        {
+            get => this.Fields[(int)ComPlusComponentPropertyTupleFields.ComPlusComponent_].AsString();
+            set => this.Set((int)ComPlusComponentPropertyTupleFields.ComPlusComponent_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusComponentPropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusComponentPropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusComponentPropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusComponentPropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusComponentTuple.cs b/src/wixext/Tuples/ComPlusComponentTuple.cs
new file mode 100644
index 00000000..923ff6e3
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusComponentTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusComponent = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusComponent.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.ComPlusComponent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.Assembly_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.CLSID), IntermediateFieldType.String),
+            },
+            typeof(ComPlusComponentTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusComponentTupleFields
+    {
+        ComPlusComponent,
+        Assembly_,
+        CLSID,
+    }
+
+    public class ComPlusComponentTuple : IntermediateTuple
+    {
+        public ComPlusComponentTuple() : base(ComPlusTupleDefinitions.ComPlusComponent, null, null)
+        {
+        }
+
+        public ComPlusComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusComponentTupleFields index] => this.Fields[(int)index];
+
+        public string ComPlusComponent
+        {
+            get => this.Fields[(int)ComPlusComponentTupleFields.ComPlusComponent].AsString();
+            set => this.Set((int)ComPlusComponentTupleFields.ComPlusComponent, value);
+        }
+
+        public string Assembly_
+        {
+            get => this.Fields[(int)ComPlusComponentTupleFields.Assembly_].AsString();
+            set => this.Set((int)ComPlusComponentTupleFields.Assembly_, value);
+        }
+
+        public string CLSID
+        {
+            get => this.Fields[(int)ComPlusComponentTupleFields.CLSID].AsString();
+            set => this.Set((int)ComPlusComponentTupleFields.CLSID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs
new file mode 100644
index 00000000..40b47eb3
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusGroupInApplicationRole = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.GroupInApplicationRole), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ApplicationRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.Group_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusGroupInApplicationRoleTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusGroupInApplicationRoleTupleFields
+    {
+        GroupInApplicationRole,
+        ApplicationRole_,
+        Component_,
+        Group_,
+    }
+
+    public class ComPlusGroupInApplicationRoleTuple : IntermediateTuple
+    {
+        public ComPlusGroupInApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, null, null)
+        {
+        }
+
+        public ComPlusGroupInApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusGroupInApplicationRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusGroupInApplicationRoleTupleFields index] => this.Fields[(int)index];
+
+        public string GroupInApplicationRole
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.GroupInApplicationRole].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.GroupInApplicationRole, value);
+        }
+
+        public string ApplicationRole_
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRole_].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.Component_, value);
+        }
+
+        public string Group_
+        {
+            get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.Group_].AsString();
+            set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.Group_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
new file mode 100644
index 00000000..092937f0
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusGroupInPartitionRole = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.Group_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusGroupInPartitionRoleTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusGroupInPartitionRoleTupleFields
+    {
+        GroupInPartitionRole,
+        PartitionRole_,
+        Component_,
+        Group_,
+    }
+
+    public class ComPlusGroupInPartitionRoleTuple : IntermediateTuple
+    {
+        public ComPlusGroupInPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, null, null)
+        {
+        }
+
+        public ComPlusGroupInPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusGroupInPartitionRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusGroupInPartitionRoleTupleFields index] => this.Fields[(int)index];
+
+        public string GroupInPartitionRole
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole, value);
+        }
+
+        public string PartitionRole_
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRole_].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.Component_, value);
+        }
+
+        public string Group_
+        {
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.Group_].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.Group_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs b/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs
new file mode 100644
index 00000000..94f12914
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusInterfacePropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusInterfaceProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusInterfaceProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Interface_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusInterfacePropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusInterfacePropertyTupleFields
+    {
+        Interface_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusInterfacePropertyTuple : IntermediateTuple
+    {
+        public ComPlusInterfacePropertyTuple() : base(ComPlusTupleDefinitions.ComPlusInterfaceProperty, null, null)
+        {
+        }
+
+        public ComPlusInterfacePropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusInterfaceProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusInterfacePropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Interface_
+        {
+            get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Interface_].AsString();
+            set => this.Set((int)ComPlusInterfacePropertyTupleFields.Interface_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusInterfacePropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusInterfacePropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusInterfaceTuple.cs b/src/wixext/Tuples/ComPlusInterfaceTuple.cs
new file mode 100644
index 00000000..3c4042ef
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusInterfaceTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusInterface = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusInterface.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.Interface), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.ComPlusComponent_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.IID), IntermediateFieldType.String),
+            },
+            typeof(ComPlusInterfaceTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusInterfaceTupleFields
+    {
+        Interface,
+        ComPlusComponent_,
+        IID,
+    }
+
+    public class ComPlusInterfaceTuple : IntermediateTuple
+    {
+        public ComPlusInterfaceTuple() : base(ComPlusTupleDefinitions.ComPlusInterface, null, null)
+        {
+        }
+
+        public ComPlusInterfaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusInterface, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusInterfaceTupleFields index] => this.Fields[(int)index];
+
+        public string Interface
+        {
+            get => this.Fields[(int)ComPlusInterfaceTupleFields.Interface].AsString();
+            set => this.Set((int)ComPlusInterfaceTupleFields.Interface, value);
+        }
+
+        public string ComPlusComponent_
+        {
+            get => this.Fields[(int)ComPlusInterfaceTupleFields.ComPlusComponent_].AsString();
+            set => this.Set((int)ComPlusInterfaceTupleFields.ComPlusComponent_, value);
+        }
+
+        public string IID
+        {
+            get => this.Fields[(int)ComPlusInterfaceTupleFields.IID].AsString();
+            set => this.Set((int)ComPlusInterfaceTupleFields.IID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs b/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs
new file mode 100644
index 00000000..8ebc3f6b
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusMethodPropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusMethodProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusMethodProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Method_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusMethodPropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusMethodPropertyTupleFields
+    {
+        Method_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusMethodPropertyTuple : IntermediateTuple
+    {
+        public ComPlusMethodPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusMethodProperty, null, null)
+        {
+        }
+
+        public ComPlusMethodPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusMethodProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusMethodPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Method_
+        {
+            get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Method_].AsString();
+            set => this.Set((int)ComPlusMethodPropertyTupleFields.Method_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusMethodPropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusMethodPropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusMethodTuple.cs b/src/wixext/Tuples/ComPlusMethodTuple.cs
new file mode 100644
index 00000000..bcca034a
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusMethodTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusMethod = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusMethod.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Method), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Interface_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Index), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusMethodTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusMethodTupleFields
+    {
+        Method,
+        Interface_,
+        Index,
+        Name,
+    }
+
+    public class ComPlusMethodTuple : IntermediateTuple
+    {
+        public ComPlusMethodTuple() : base(ComPlusTupleDefinitions.ComPlusMethod, null, null)
+        {
+        }
+
+        public ComPlusMethodTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusMethod, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusMethodTupleFields index] => this.Fields[(int)index];
+
+        public string Method
+        {
+            get => this.Fields[(int)ComPlusMethodTupleFields.Method].AsString();
+            set => this.Set((int)ComPlusMethodTupleFields.Method, value);
+        }
+
+        public string Interface_
+        {
+            get => this.Fields[(int)ComPlusMethodTupleFields.Interface_].AsString();
+            set => this.Set((int)ComPlusMethodTupleFields.Interface_, value);
+        }
+
+        public int Index
+        {
+            get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNumber();
+            set => this.Set((int)ComPlusMethodTupleFields.Index, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusMethodTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusMethodTupleFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs b/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs
new file mode 100644
index 00000000..3427b10a
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusPartitionPropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusPartitionProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusPartitionProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Partition_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionPropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionPropertyTupleFields
+    {
+        Partition_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusPartitionPropertyTuple : IntermediateTuple
+    {
+        public ComPlusPartitionPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionProperty, null, null)
+        {
+        }
+
+        public ComPlusPartitionPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Partition_
+        {
+            get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Partition_].AsString();
+            set => this.Set((int)ComPlusPartitionPropertyTupleFields.Partition_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusPartitionPropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusPartitionPropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs
new file mode 100644
index 00000000..a2259cc6
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusPartitionRoleTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusPartitionRole = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusPartitionRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.PartitionRole), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Partition_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionRoleTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionRoleTupleFields
+    {
+        PartitionRole,
+        Partition_,
+        Component_,
+        Name,
+    }
+
+    public class ComPlusPartitionRoleTuple : IntermediateTuple
+    {
+        public ComPlusPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionRole, null, null)
+        {
+        }
+
+        public ComPlusPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionRoleTupleFields index] => this.Fields[(int)index];
+
+        public string PartitionRole
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleTupleFields.PartitionRole].AsString();
+            set => this.Set((int)ComPlusPartitionRoleTupleFields.PartitionRole, value);
+        }
+
+        public string Partition_
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Partition_].AsString();
+            set => this.Set((int)ComPlusPartitionRoleTupleFields.Partition_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusPartitionRoleTupleFields.Component_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusPartitionRoleTupleFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusPartitionTuple.cs b/src/wixext/Tuples/ComPlusPartitionTuple.cs
new file mode 100644
index 00000000..68de9955
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusPartitionTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusPartition = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusPartition.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Partition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.CustomId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Name), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionTupleFields
+    {
+        Partition,
+        Component_,
+        CustomId,
+        Name,
+    }
+
+    public class ComPlusPartitionTuple : IntermediateTuple
+    {
+        public ComPlusPartitionTuple() : base(ComPlusTupleDefinitions.ComPlusPartition, null, null)
+        {
+        }
+
+        public ComPlusPartitionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartition, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionTupleFields index] => this.Fields[(int)index];
+
+        public string Partition
+        {
+            get => this.Fields[(int)ComPlusPartitionTupleFields.Partition].AsString();
+            set => this.Set((int)ComPlusPartitionTupleFields.Partition, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusPartitionTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusPartitionTupleFields.Component_, value);
+        }
+
+        public string CustomId
+        {
+            get => this.Fields[(int)ComPlusPartitionTupleFields.CustomId].AsString();
+            set => this.Set((int)ComPlusPartitionTupleFields.CustomId, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusPartitionTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusPartitionTupleFields.Name, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusPartitionUserTuple.cs b/src/wixext/Tuples/ComPlusPartitionUserTuple.cs
new file mode 100644
index 00000000..33a58d38
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusPartitionUserTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusPartitionUser = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusPartitionUser.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.PartitionUser), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.Partition_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.User_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusPartitionUserTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusPartitionUserTupleFields
+    {
+        PartitionUser,
+        Partition_,
+        Component_,
+        User_,
+    }
+
+    public class ComPlusPartitionUserTuple : IntermediateTuple
+    {
+        public ComPlusPartitionUserTuple() : base(ComPlusTupleDefinitions.ComPlusPartitionUser, null, null)
+        {
+        }
+
+        public ComPlusPartitionUserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusPartitionUser, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusPartitionUserTupleFields index] => this.Fields[(int)index];
+
+        public string PartitionUser
+        {
+            get => this.Fields[(int)ComPlusPartitionUserTupleFields.PartitionUser].AsString();
+            set => this.Set((int)ComPlusPartitionUserTupleFields.PartitionUser, value);
+        }
+
+        public string Partition_
+        {
+            get => this.Fields[(int)ComPlusPartitionUserTupleFields.Partition_].AsString();
+            set => this.Set((int)ComPlusPartitionUserTupleFields.Partition_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusPartitionUserTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusPartitionUserTupleFields.Component_, value);
+        }
+
+        public string User_
+        {
+            get => this.Fields[(int)ComPlusPartitionUserTupleFields.User_].AsString();
+            set => this.Set((int)ComPlusPartitionUserTupleFields.User_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs b/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs
new file mode 100644
index 00000000..75d8cfaf
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusRoleForComponentTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusRoleForComponent = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusRoleForComponent.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.RoleForComponent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComPlusComponent_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ApplicationRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusRoleForComponentTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusRoleForComponentTupleFields
+    {
+        RoleForComponent,
+        ComPlusComponent_,
+        ApplicationRole_,
+        Component_,
+    }
+
+    public class ComPlusRoleForComponentTuple : IntermediateTuple
+    {
+        public ComPlusRoleForComponentTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForComponent, null, null)
+        {
+        }
+
+        public ComPlusRoleForComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForComponent, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusRoleForComponentTupleFields index] => this.Fields[(int)index];
+
+        public string RoleForComponent
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentTupleFields.RoleForComponent].AsString();
+            set => this.Set((int)ComPlusRoleForComponentTupleFields.RoleForComponent, value);
+        }
+
+        public string ComPlusComponent_
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComPlusComponent_].AsString();
+            set => this.Set((int)ComPlusRoleForComponentTupleFields.ComPlusComponent_, value);
+        }
+
+        public string ApplicationRole_
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ApplicationRole_].AsString();
+            set => this.Set((int)ComPlusRoleForComponentTupleFields.ApplicationRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusRoleForComponentTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusRoleForComponentTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs b/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs
new file mode 100644
index 00000000..139417d3
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusRoleForInterface = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusRoleForInterface.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.RoleForInterface), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.Interface_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ApplicationRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusRoleForInterfaceTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusRoleForInterfaceTupleFields
+    {
+        RoleForInterface,
+        Interface_,
+        ApplicationRole_,
+        Component_,
+    }
+
+    public class ComPlusRoleForInterfaceTuple : IntermediateTuple
+    {
+        public ComPlusRoleForInterfaceTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForInterface, null, null)
+        {
+        }
+
+        public ComPlusRoleForInterfaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForInterface, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusRoleForInterfaceTupleFields index] => this.Fields[(int)index];
+
+        public string RoleForInterface
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.RoleForInterface].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceTupleFields.RoleForInterface, value);
+        }
+
+        public string Interface_
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.Interface_].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceTupleFields.Interface_, value);
+        }
+
+        public string ApplicationRole_
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ApplicationRole_].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ApplicationRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusRoleForInterfaceTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs b/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs
new file mode 100644
index 00000000..5b6e994e
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusRoleForMethodTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusRoleForMethod = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusRoleForMethod.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.RoleForMethod), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.Method_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ApplicationRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.Component_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusRoleForMethodTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusRoleForMethodTupleFields
+    {
+        RoleForMethod,
+        Method_,
+        ApplicationRole_,
+        Component_,
+    }
+
+    public class ComPlusRoleForMethodTuple : IntermediateTuple
+    {
+        public ComPlusRoleForMethodTuple() : base(ComPlusTupleDefinitions.ComPlusRoleForMethod, null, null)
+        {
+        }
+
+        public ComPlusRoleForMethodTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusRoleForMethod, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusRoleForMethodTupleFields index] => this.Fields[(int)index];
+
+        public string RoleForMethod
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodTupleFields.RoleForMethod].AsString();
+            set => this.Set((int)ComPlusRoleForMethodTupleFields.RoleForMethod, value);
+        }
+
+        public string Method_
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodTupleFields.Method_].AsString();
+            set => this.Set((int)ComPlusRoleForMethodTupleFields.Method_, value);
+        }
+
+        public string ApplicationRole_
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ApplicationRole_].AsString();
+            set => this.Set((int)ComPlusRoleForMethodTupleFields.ApplicationRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusRoleForMethodTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusRoleForMethodTupleFields.Component_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs b/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs
new file mode 100644
index 00000000..ad0841f4
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusSubscriptionProperty = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusSubscriptionProperty.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Subscription_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Value), IntermediateFieldType.String),
+            },
+            typeof(ComPlusSubscriptionPropertyTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusSubscriptionPropertyTupleFields
+    {
+        Subscription_,
+        Name,
+        Value,
+    }
+
+    public class ComPlusSubscriptionPropertyTuple : IntermediateTuple
+    {
+        public ComPlusSubscriptionPropertyTuple() : base(ComPlusTupleDefinitions.ComPlusSubscriptionProperty, null, null)
+        {
+        }
+
+        public ComPlusSubscriptionPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusSubscriptionProperty, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusSubscriptionPropertyTupleFields index] => this.Fields[(int)index];
+
+        public string Subscription_
+        {
+            get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Subscription_].AsString();
+            set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Subscription_, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Name, value);
+        }
+
+        public string Value
+        {
+            get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Value].AsString();
+            set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Value, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusSubscriptionTuple.cs b/src/wixext/Tuples/ComPlusSubscriptionTuple.cs
new file mode 100644
index 00000000..fedab172
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusSubscriptionTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusSubscription = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusSubscription.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Subscription), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComPlusComponent_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.CustomId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.EventCLSID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.PublisherID), IntermediateFieldType.String),
+            },
+            typeof(ComPlusSubscriptionTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusSubscriptionTupleFields
+    {
+        Subscription,
+        ComPlusComponent_,
+        Component_,
+        CustomId,
+        Name,
+        EventCLSID,
+        PublisherID,
+    }
+
+    public class ComPlusSubscriptionTuple : IntermediateTuple
+    {
+        public ComPlusSubscriptionTuple() : base(ComPlusTupleDefinitions.ComPlusSubscription, null, null)
+        {
+        }
+
+        public ComPlusSubscriptionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusSubscription, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusSubscriptionTupleFields index] => this.Fields[(int)index];
+
+        public string Subscription
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.Subscription].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.Subscription, value);
+        }
+
+        public string ComPlusComponent_
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComPlusComponent_].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.ComPlusComponent_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.Component_, value);
+        }
+
+        public string CustomId
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.CustomId].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.CustomId, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.Name].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.Name, value);
+        }
+
+        public string EventCLSID
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.EventCLSID].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.EventCLSID, value);
+        }
+
+        public string PublisherID
+        {
+            get => this.Fields[(int)ComPlusSubscriptionTupleFields.PublisherID].AsString();
+            set => this.Set((int)ComPlusSubscriptionTupleFields.PublisherID, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusTupleDefinitions.cs b/src/wixext/Tuples/ComPlusTupleDefinitions.cs
new file mode 100644
index 00000000..1019c046
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusTupleDefinitions.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 ComPlusTupleDefinitionType
+    {
+        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 ComPlusTupleDefinitions
+    {
+        public static readonly Version Version = new Version("4.0.0");
+
+        public static IntermediateTupleDefinition ByName(string name)
+        {
+            if (!Enum.TryParse(name, out ComPlusTupleDefinitionType type))
+            {
+                return null;
+            }
+
+            return ByType(type);
+        }
+
+        public static IntermediateTupleDefinition ByType(ComPlusTupleDefinitionType type)
+        {
+            switch (type)
+            {
+                case ComPlusTupleDefinitionType.ComPlusApplication:
+                    return ComPlusTupleDefinitions.ComPlusApplication;
+
+                case ComPlusTupleDefinitionType.ComPlusApplicationProperty:
+                    return ComPlusTupleDefinitions.ComPlusApplicationProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusApplicationRole:
+                    return ComPlusTupleDefinitions.ComPlusApplicationRole;
+
+                case ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty:
+                    return ComPlusTupleDefinitions.ComPlusApplicationRoleProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusAssembly:
+                    return ComPlusTupleDefinitions.ComPlusAssembly;
+
+                case ComPlusTupleDefinitionType.ComPlusAssemblyDependency:
+                    return ComPlusTupleDefinitions.ComPlusAssemblyDependency;
+
+                case ComPlusTupleDefinitionType.ComPlusComponent:
+                    return ComPlusTupleDefinitions.ComPlusComponent;
+
+                case ComPlusTupleDefinitionType.ComPlusComponentProperty:
+                    return ComPlusTupleDefinitions.ComPlusComponentProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole:
+                    return ComPlusTupleDefinitions.ComPlusGroupInApplicationRole;
+
+                case ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole:
+                    return ComPlusTupleDefinitions.ComPlusGroupInPartitionRole;
+
+                case ComPlusTupleDefinitionType.ComPlusInterface:
+                    return ComPlusTupleDefinitions.ComPlusInterface;
+
+                case ComPlusTupleDefinitionType.ComPlusInterfaceProperty:
+                    return ComPlusTupleDefinitions.ComPlusInterfaceProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusMethod:
+                    return ComPlusTupleDefinitions.ComPlusMethod;
+
+                case ComPlusTupleDefinitionType.ComPlusMethodProperty:
+                    return ComPlusTupleDefinitions.ComPlusMethodProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusPartition:
+                    return ComPlusTupleDefinitions.ComPlusPartition;
+
+                case ComPlusTupleDefinitionType.ComPlusPartitionProperty:
+                    return ComPlusTupleDefinitions.ComPlusPartitionProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusPartitionRole:
+                    return ComPlusTupleDefinitions.ComPlusPartitionRole;
+
+                case ComPlusTupleDefinitionType.ComPlusPartitionUser:
+                    return ComPlusTupleDefinitions.ComPlusPartitionUser;
+
+                case ComPlusTupleDefinitionType.ComPlusRoleForComponent:
+                    return ComPlusTupleDefinitions.ComPlusRoleForComponent;
+
+                case ComPlusTupleDefinitionType.ComPlusRoleForInterface:
+                    return ComPlusTupleDefinitions.ComPlusRoleForInterface;
+
+                case ComPlusTupleDefinitionType.ComPlusRoleForMethod:
+                    return ComPlusTupleDefinitions.ComPlusRoleForMethod;
+
+                case ComPlusTupleDefinitionType.ComPlusSubscription:
+                    return ComPlusTupleDefinitions.ComPlusSubscription;
+
+                case ComPlusTupleDefinitionType.ComPlusSubscriptionProperty:
+                    return ComPlusTupleDefinitions.ComPlusSubscriptionProperty;
+
+                case ComPlusTupleDefinitionType.ComPlusUserInApplicationRole:
+                    return ComPlusTupleDefinitions.ComPlusUserInApplicationRole;
+
+                case ComPlusTupleDefinitionType.ComPlusUserInPartitionRole:
+                    return ComPlusTupleDefinitions.ComPlusUserInPartitionRole;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+    }
+}
diff --git a/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs
new file mode 100644
index 00000000..3916c0ee
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusUserInApplicationRole = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusUserInApplicationRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.UserInApplicationRole), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ApplicationRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.User_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusUserInApplicationRoleTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusUserInApplicationRoleTupleFields
+    {
+        UserInApplicationRole,
+        ApplicationRole_,
+        Component_,
+        User_,
+    }
+
+    public class ComPlusUserInApplicationRoleTuple : IntermediateTuple
+    {
+        public ComPlusUserInApplicationRoleTuple() : base(ComPlusTupleDefinitions.ComPlusUserInApplicationRole, null, null)
+        {
+        }
+
+        public ComPlusUserInApplicationRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusUserInApplicationRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusUserInApplicationRoleTupleFields index] => this.Fields[(int)index];
+
+        public string UserInApplicationRole
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.UserInApplicationRole].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.UserInApplicationRole, value);
+        }
+
+        public string ApplicationRole_
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ApplicationRole_].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ApplicationRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.Component_, value);
+        }
+
+        public string User_
+        {
+            get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.User_].AsString();
+            set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.User_, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs
new file mode 100644
index 00000000..06d742b8
--- /dev/null
+++ b/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.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.Tuples;
+
+    public static partial class ComPlusTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition ComPlusUserInPartitionRole = new IntermediateTupleDefinition(
+            ComPlusTupleDefinitionType.ComPlusUserInPartitionRole.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.UserInPartitionRole), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.PartitionRole_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.User_), IntermediateFieldType.String),
+            },
+            typeof(ComPlusUserInPartitionRoleTuple));
+    }
+}
+
+namespace WixToolset.ComPlus.Tuples
+{
+    using WixToolset.Data;
+
+    public enum ComPlusUserInPartitionRoleTupleFields
+    {
+        UserInPartitionRole,
+        PartitionRole_,
+        Component_,
+        User_,
+    }
+
+    public class ComPlusUserInPartitionRoleTuple : IntermediateTuple
+    {
+        public ComPlusUserInPartitionRoleTuple() : base(ComPlusTupleDefinitions.ComPlusUserInPartitionRole, null, null)
+        {
+        }
+
+        public ComPlusUserInPartitionRoleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ComPlusTupleDefinitions.ComPlusUserInPartitionRole, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[ComPlusUserInPartitionRoleTupleFields index] => this.Fields[(int)index];
+
+        public string UserInPartitionRole
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.UserInPartitionRole].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.UserInPartitionRole, value);
+        }
+
+        public string PartitionRole_
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.PartitionRole_].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.PartitionRole_, value);
+        }
+
+        public string Component_
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.Component_].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.Component_, value);
+        }
+
+        public string User_
+        {
+            get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.User_].AsString();
+            set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.User_, value);
+        }
+    }
+}
\ No newline at end of file