aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/Tuples
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-08 11:46:38 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-08 14:23:11 +1000
commitd8ef78a2b67d15d0bbd09d10e920b38d36c34435 (patch)
tree09870ce0399dfcd0d4710c261f6c5d7930ca3c41 /src/wixext/Tuples
parent70be1d502423a22df7f28cc283761434d3a0eeaa (diff)
downloadwix-d8ef78a2b67d15d0bbd09d10e920b38d36c34435.tar.gz
wix-d8ef78a2b67d15d0bbd09d10e920b38d36c34435.tar.bz2
wix-d8ef78a2b67d15d0bbd09d10e920b38d36c34435.zip
Modernize ComPlusCompiler and tuples.
Diffstat (limited to 'src/wixext/Tuples')
-rw-r--r--src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusApplicationRoleTuple.cs28
-rw-r--r--src/wixext/Tuples/ComPlusApplicationTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs20
-rw-r--r--src/wixext/Tuples/ComPlusAssemblyTuple.cs28
-rw-r--r--src/wixext/Tuples/ComPlusComponentPropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusComponentTuple.cs18
-rw-r--r--src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusInterfaceTuple.cs18
-rw-r--r--src/wixext/Tuples/ComPlusMethodPropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusMethodTuple.cs18
-rw-r--r--src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusPartitionRoleTuple.cs28
-rw-r--r--src/wixext/Tuples/ComPlusPartitionTuple.cs28
-rw-r--r--src/wixext/Tuples/ComPlusPartitionUserTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusRoleForComponentTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusRoleForMethodTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs10
-rw-r--r--src/wixext/Tuples/ComPlusSubscriptionTuple.cs30
-rw-r--r--src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs38
-rw-r--r--src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs38
25 files changed, 250 insertions, 378 deletions
diff --git a/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs b/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs
index 2582d323..b73dca76 100644
--- a/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusApplicationPropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusApplicationProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusApplicationProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Application_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.ApplicationRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusApplicationPropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusApplicationPropertyTupleFields 26 public enum ComPlusApplicationPropertyTupleFields
27 { 27 {
28 Application_, 28 ApplicationRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusApplicationPropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusApplicationPropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string Application_ 45 public string ApplicationRef
46 { 46 {
47 get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.Application_].AsString(); 47 get => this.Fields[(int)ComPlusApplicationPropertyTupleFields.ApplicationRef].AsString();
48 set => this.Set((int)ComPlusApplicationPropertyTupleFields.Application_, value); 48 set => this.Set((int)ComPlusApplicationPropertyTupleFields.ApplicationRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs b/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs
index 98eee7f8..19da706b 100644
--- a/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusApplicationRolePropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusApplicationRoleProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.ApplicationRole_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusApplicationRolePropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusApplicationRolePropertyTupleFields 26 public enum ComPlusApplicationRolePropertyTupleFields
27 { 27 {
28 ApplicationRole_, 28 ApplicationRoleRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusApplicationRolePropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusApplicationRolePropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string ApplicationRole_ 45 public string ApplicationRoleRef
46 { 46 {
47 get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.ApplicationRole_].AsString(); 47 get => this.Fields[(int)ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef].AsString();
48 set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.ApplicationRole_, value); 48 set => this.Set((int)ComPlusApplicationRolePropertyTupleFields.ApplicationRoleRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs
index 5a0cf378..bd9cdcf8 100644
--- a/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusApplicationRoleTuple.cs
@@ -11,9 +11,8 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusApplicationRole.ToString(), 11 ComPlusTupleDefinitionType.ComPlusApplicationRole.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ApplicationRole), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ApplicationRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Application_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Component_), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Name), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusApplicationRoleTupleFields.Name), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusApplicationRoleTuple)); 18 typeof(ComPlusApplicationRoleTuple));
@@ -26,9 +25,8 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusApplicationRoleTupleFields 26 public enum ComPlusApplicationRoleTupleFields
28 { 27 {
29 ApplicationRole, 28 ApplicationRef,
30 Application_, 29 ComponentRef,
31 Component_,
32 Name, 30 Name,
33 } 31 }
34 32
@@ -44,22 +42,16 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusApplicationRoleTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusApplicationRoleTupleFields index] => this.Fields[(int)index];
46 44
47 public string ApplicationRole 45 public string ApplicationRef
48 { 46 {
49 get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ApplicationRole].AsString(); 47 get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ApplicationRef].AsString();
50 set => this.Set((int)ComPlusApplicationRoleTupleFields.ApplicationRole, value); 48 set => this.Set((int)ComPlusApplicationRoleTupleFields.ApplicationRef, value);
51 } 49 }
52 50
53 public string Application_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Application_].AsString(); 53 get => this.Fields[(int)ComPlusApplicationRoleTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusApplicationRoleTupleFields.Application_, value); 54 set => this.Set((int)ComPlusApplicationRoleTupleFields.ComponentRef, value);
57 }
58
59 public string Component_
60 {
61 get => this.Fields[(int)ComPlusApplicationRoleTupleFields.Component_].AsString();
62 set => this.Set((int)ComPlusApplicationRoleTupleFields.Component_, value);
63 } 55 }
64 56
65 public string Name 57 public string Name
diff --git a/src/wixext/Tuples/ComPlusApplicationTuple.cs b/src/wixext/Tuples/ComPlusApplicationTuple.cs
index 7fd5fbd4..7420b538 100644
--- a/src/wixext/Tuples/ComPlusApplicationTuple.cs
+++ b/src/wixext/Tuples/ComPlusApplicationTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusApplication.ToString(), 11 ComPlusTupleDefinitionType.ComPlusApplication.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Application), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.PartitionRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Partition_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.ApplicationId), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.CustomId), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Name), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(ComPlusApplicationTupleFields.Name), IntermediateFieldType.String),
19 }, 18 },
20 typeof(ComPlusApplicationTuple)); 19 typeof(ComPlusApplicationTuple));
@@ -27,10 +26,9 @@ namespace WixToolset.ComPlus.Tuples
27 26
28 public enum ComPlusApplicationTupleFields 27 public enum ComPlusApplicationTupleFields
29 { 28 {
30 Application, 29 PartitionRef,
31 Partition_, 30 ComponentRef,
32 Component_, 31 ApplicationId,
33 CustomId,
34 Name, 32 Name,
35 } 33 }
36 34
@@ -46,28 +44,22 @@ namespace WixToolset.ComPlus.Tuples
46 44
47 public IntermediateField this[ComPlusApplicationTupleFields index] => this.Fields[(int)index]; 45 public IntermediateField this[ComPlusApplicationTupleFields index] => this.Fields[(int)index];
48 46
49 public string Application 47 public string PartitionRef
50 { 48 {
51 get => this.Fields[(int)ComPlusApplicationTupleFields.Application].AsString(); 49 get => this.Fields[(int)ComPlusApplicationTupleFields.PartitionRef].AsString();
52 set => this.Set((int)ComPlusApplicationTupleFields.Application, value); 50 set => this.Set((int)ComPlusApplicationTupleFields.PartitionRef, value);
53 } 51 }
54 52
55 public string Partition_ 53 public string ComponentRef
56 { 54 {
57 get => this.Fields[(int)ComPlusApplicationTupleFields.Partition_].AsString(); 55 get => this.Fields[(int)ComPlusApplicationTupleFields.ComponentRef].AsString();
58 set => this.Set((int)ComPlusApplicationTupleFields.Partition_, value); 56 set => this.Set((int)ComPlusApplicationTupleFields.ComponentRef, value);
59 } 57 }
60 58
61 public string Component_ 59 public string ApplicationId
62 { 60 {
63 get => this.Fields[(int)ComPlusApplicationTupleFields.Component_].AsString(); 61 get => this.Fields[(int)ComPlusApplicationTupleFields.ApplicationId].AsString();
64 set => this.Set((int)ComPlusApplicationTupleFields.Component_, value); 62 set => this.Set((int)ComPlusApplicationTupleFields.ApplicationId, value);
65 }
66
67 public string CustomId
68 {
69 get => this.Fields[(int)ComPlusApplicationTupleFields.CustomId].AsString();
70 set => this.Set((int)ComPlusApplicationTupleFields.CustomId, value);
71 } 63 }
72 64
73 public string Name 65 public string Name
diff --git a/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs b/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs
index be0bc073..f57f0d0a 100644
--- a/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs
+++ b/src/wixext/Tuples/ComPlusAssemblyDependencyTuple.cs
@@ -11,8 +11,8 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusAssemblyDependency.ToString(), 11 ComPlusTupleDefinitionType.ComPlusAssemblyDependency.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.Assembly_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.AssemblyRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.RequiredAssembly_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef), IntermediateFieldType.String),
16 }, 16 },
17 typeof(ComPlusAssemblyDependencyTuple)); 17 typeof(ComPlusAssemblyDependencyTuple));
18 } 18 }
@@ -24,8 +24,8 @@ namespace WixToolset.ComPlus.Tuples
24 24
25 public enum ComPlusAssemblyDependencyTupleFields 25 public enum ComPlusAssemblyDependencyTupleFields
26 { 26 {
27 Assembly_, 27 AssemblyRef,
28 RequiredAssembly_, 28 RequiredAssemblyRef,
29 } 29 }
30 30
31 public class ComPlusAssemblyDependencyTuple : IntermediateTuple 31 public class ComPlusAssemblyDependencyTuple : IntermediateTuple
@@ -40,16 +40,16 @@ namespace WixToolset.ComPlus.Tuples
40 40
41 public IntermediateField this[ComPlusAssemblyDependencyTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[ComPlusAssemblyDependencyTupleFields index] => this.Fields[(int)index];
42 42
43 public string Assembly_ 43 public string AssemblyRef
44 { 44 {
45 get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.Assembly_].AsString(); 45 get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.AssemblyRef].AsString();
46 set => this.Set((int)ComPlusAssemblyDependencyTupleFields.Assembly_, value); 46 set => this.Set((int)ComPlusAssemblyDependencyTupleFields.AssemblyRef, value);
47 } 47 }
48 48
49 public string RequiredAssembly_ 49 public string RequiredAssemblyRef
50 { 50 {
51 get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.RequiredAssembly_].AsString(); 51 get => this.Fields[(int)ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef].AsString();
52 set => this.Set((int)ComPlusAssemblyDependencyTupleFields.RequiredAssembly_, value); 52 set => this.Set((int)ComPlusAssemblyDependencyTupleFields.RequiredAssemblyRef, value);
53 } 53 }
54 } 54 }
55} \ No newline at end of file 55} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusAssemblyTuple.cs b/src/wixext/Tuples/ComPlusAssemblyTuple.cs
index 0330b4e8..c4593cad 100644
--- a/src/wixext/Tuples/ComPlusAssemblyTuple.cs
+++ b/src/wixext/Tuples/ComPlusAssemblyTuple.cs
@@ -11,9 +11,8 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusAssembly.ToString(), 11 ComPlusTupleDefinitionType.ComPlusAssembly.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Assembly), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.ApplicationRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Application_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.Component_), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.AssemblyName), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.AssemblyName), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.DllPath), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.DllPath), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.TlbPath), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(ComPlusAssemblyTupleFields.TlbPath), IntermediateFieldType.String),
@@ -30,9 +29,8 @@ namespace WixToolset.ComPlus.Tuples
30 29
31 public enum ComPlusAssemblyTupleFields 30 public enum ComPlusAssemblyTupleFields
32 { 31 {
33 Assembly, 32 ApplicationRef,
34 Application_, 33 ComponentRef,
35 Component_,
36 AssemblyName, 34 AssemblyName,
37 DllPath, 35 DllPath,
38 TlbPath, 36 TlbPath,
@@ -52,22 +50,16 @@ namespace WixToolset.ComPlus.Tuples
52 50
53 public IntermediateField this[ComPlusAssemblyTupleFields index] => this.Fields[(int)index]; 51 public IntermediateField this[ComPlusAssemblyTupleFields index] => this.Fields[(int)index];
54 52
55 public string Assembly 53 public string ApplicationRef
56 { 54 {
57 get => this.Fields[(int)ComPlusAssemblyTupleFields.Assembly].AsString(); 55 get => this.Fields[(int)ComPlusAssemblyTupleFields.ApplicationRef].AsString();
58 set => this.Set((int)ComPlusAssemblyTupleFields.Assembly, value); 56 set => this.Set((int)ComPlusAssemblyTupleFields.ApplicationRef, value);
59 } 57 }
60 58
61 public string Application_ 59 public string ComponentRef
62 { 60 {
63 get => this.Fields[(int)ComPlusAssemblyTupleFields.Application_].AsString(); 61 get => this.Fields[(int)ComPlusAssemblyTupleFields.ComponentRef].AsString();
64 set => this.Set((int)ComPlusAssemblyTupleFields.Application_, value); 62 set => this.Set((int)ComPlusAssemblyTupleFields.ComponentRef, value);
65 }
66
67 public string Component_
68 {
69 get => this.Fields[(int)ComPlusAssemblyTupleFields.Component_].AsString();
70 set => this.Set((int)ComPlusAssemblyTupleFields.Component_, value);
71 } 63 }
72 64
73 public string AssemblyName 65 public string AssemblyName
diff --git a/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs b/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs
index 81651343..4de5a032 100644
--- a/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusComponentPropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusComponentProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusComponentProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.ComPlusComponent_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusComponentPropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusComponentPropertyTupleFields 26 public enum ComPlusComponentPropertyTupleFields
27 { 27 {
28 ComPlusComponent_, 28 ComPlusComponentRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusComponentPropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusComponentPropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string ComPlusComponent_ 45 public string ComPlusComponentRef
46 { 46 {
47 get => this.Fields[(int)ComPlusComponentPropertyTupleFields.ComPlusComponent_].AsString(); 47 get => this.Fields[(int)ComPlusComponentPropertyTupleFields.ComPlusComponentRef].AsString();
48 set => this.Set((int)ComPlusComponentPropertyTupleFields.ComPlusComponent_, value); 48 set => this.Set((int)ComPlusComponentPropertyTupleFields.ComPlusComponentRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusComponentTuple.cs b/src/wixext/Tuples/ComPlusComponentTuple.cs
index 923ff6e3..70a17a5d 100644
--- a/src/wixext/Tuples/ComPlusComponentTuple.cs
+++ b/src/wixext/Tuples/ComPlusComponentTuple.cs
@@ -11,8 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusComponent.ToString(), 11 ComPlusTupleDefinitionType.ComPlusComponent.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.ComPlusComponent), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.AssemblyRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.Assembly_), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.CLSID), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusComponentTupleFields.CLSID), IntermediateFieldType.String),
17 }, 16 },
18 typeof(ComPlusComponentTuple)); 17 typeof(ComPlusComponentTuple));
@@ -25,8 +24,7 @@ namespace WixToolset.ComPlus.Tuples
25 24
26 public enum ComPlusComponentTupleFields 25 public enum ComPlusComponentTupleFields
27 { 26 {
28 ComPlusComponent, 27 AssemblyRef,
29 Assembly_,
30 CLSID, 28 CLSID,
31 } 29 }
32 30
@@ -42,16 +40,10 @@ namespace WixToolset.ComPlus.Tuples
42 40
43 public IntermediateField this[ComPlusComponentTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[ComPlusComponentTupleFields index] => this.Fields[(int)index];
44 42
45 public string ComPlusComponent 43 public string AssemblyRef
46 { 44 {
47 get => this.Fields[(int)ComPlusComponentTupleFields.ComPlusComponent].AsString(); 45 get => this.Fields[(int)ComPlusComponentTupleFields.AssemblyRef].AsString();
48 set => this.Set((int)ComPlusComponentTupleFields.ComPlusComponent, value); 46 set => this.Set((int)ComPlusComponentTupleFields.AssemblyRef, value);
49 }
50
51 public string Assembly_
52 {
53 get => this.Fields[(int)ComPlusComponentTupleFields.Assembly_].AsString();
54 set => this.Set((int)ComPlusComponentTupleFields.Assembly_, value);
55 } 47 }
56 48
57 public string CLSID 49 public string CLSID
diff --git a/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs
index 40b47eb3..df61d3d4 100644
--- a/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusGroupInApplicationRoleTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole.ToString(), 11 ComPlusTupleDefinitionType.ComPlusGroupInApplicationRole.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.GroupInApplicationRole), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ApplicationRole_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.GroupRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusGroupInApplicationRoleTupleFields.Group_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusGroupInApplicationRoleTuple)); 18 typeof(ComPlusGroupInApplicationRoleTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusGroupInApplicationRoleTupleFields 26 public enum ComPlusGroupInApplicationRoleTupleFields
28 { 27 {
29 GroupInApplicationRole, 28 ApplicationRoleRef,
30 ApplicationRole_, 29 ComponentRef,
31 Component_, 30 GroupRef,
32 Group_,
33 } 31 }
34 32
35 public class ComPlusGroupInApplicationRoleTuple : IntermediateTuple 33 public class ComPlusGroupInApplicationRoleTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusGroupInApplicationRoleTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusGroupInApplicationRoleTupleFields index] => this.Fields[(int)index];
46 44
47 public string GroupInApplicationRole 45 public string ApplicationRoleRef
48 { 46 {
49 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.GroupInApplicationRole].AsString(); 47 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef].AsString();
50 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.GroupInApplicationRole, value); 48 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRoleRef, value);
51 } 49 }
52 50
53 public string ApplicationRole_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRole_].AsString(); 53 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ApplicationRole_, value); 54 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.ComponentRef, value);
57 } 55 }
58 56
59 public string Component_ 57 public string GroupRef
60 { 58 {
61 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.Component_].AsString(); 59 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.GroupRef].AsString();
62 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.Component_, value); 60 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.GroupRef, value);
63 }
64
65 public string Group_
66 {
67 get => this.Fields[(int)ComPlusGroupInApplicationRoleTupleFields.Group_].AsString();
68 set => this.Set((int)ComPlusGroupInApplicationRoleTupleFields.Group_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
index 092937f0..507e9cdc 100644
--- a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole.ToString(), 11 ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRole_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.Group_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusGroupInPartitionRoleTuple)); 18 typeof(ComPlusGroupInPartitionRoleTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusGroupInPartitionRoleTupleFields 26 public enum ComPlusGroupInPartitionRoleTupleFields
28 { 27 {
29 GroupInPartitionRole, 28 PartitionRoleRef,
30 PartitionRole_, 29 ComponentRef,
31 Component_, 30 GroupRef,
32 Group_,
33 } 31 }
34 32
35 public class ComPlusGroupInPartitionRoleTuple : IntermediateTuple 33 public class ComPlusGroupInPartitionRoleTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusGroupInPartitionRoleTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusGroupInPartitionRoleTupleFields index] => this.Fields[(int)index];
46 44
47 public string GroupInPartitionRole 45 public string PartitionRoleRef
48 { 46 {
49 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole].AsString(); 47 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef].AsString();
50 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole, value); 48 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef, value);
51 } 49 }
52 50
53 public string PartitionRole_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRole_].AsString(); 53 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRole_, value); 54 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef, value);
57 } 55 }
58 56
59 public string Component_ 57 public string GroupRef
60 { 58 {
61 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.Component_].AsString(); 59 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupRef].AsString();
62 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.Component_, value); 60 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupRef, value);
63 }
64
65 public string Group_
66 {
67 get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.Group_].AsString();
68 set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.Group_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs b/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs
index 94f12914..699c9597 100644
--- a/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusInterfacePropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusInterfaceProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusInterfaceProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Interface_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.InterfaceRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusInterfacePropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusInterfacePropertyTupleFields 26 public enum ComPlusInterfacePropertyTupleFields
27 { 27 {
28 Interface_, 28 InterfaceRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusInterfacePropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusInterfacePropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string Interface_ 45 public string InterfaceRef
46 { 46 {
47 get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.Interface_].AsString(); 47 get => this.Fields[(int)ComPlusInterfacePropertyTupleFields.InterfaceRef].AsString();
48 set => this.Set((int)ComPlusInterfacePropertyTupleFields.Interface_, value); 48 set => this.Set((int)ComPlusInterfacePropertyTupleFields.InterfaceRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusInterfaceTuple.cs b/src/wixext/Tuples/ComPlusInterfaceTuple.cs
index 3c4042ef..42d41ded 100644
--- a/src/wixext/Tuples/ComPlusInterfaceTuple.cs
+++ b/src/wixext/Tuples/ComPlusInterfaceTuple.cs
@@ -11,8 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusInterface.ToString(), 11 ComPlusTupleDefinitionType.ComPlusInterface.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.Interface), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.ComPlusComponent_), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.IID), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusInterfaceTupleFields.IID), IntermediateFieldType.String),
17 }, 16 },
18 typeof(ComPlusInterfaceTuple)); 17 typeof(ComPlusInterfaceTuple));
@@ -25,8 +24,7 @@ namespace WixToolset.ComPlus.Tuples
25 24
26 public enum ComPlusInterfaceTupleFields 25 public enum ComPlusInterfaceTupleFields
27 { 26 {
28 Interface, 27 ComPlusComponentRef,
29 ComPlusComponent_,
30 IID, 28 IID,
31 } 29 }
32 30
@@ -42,16 +40,10 @@ namespace WixToolset.ComPlus.Tuples
42 40
43 public IntermediateField this[ComPlusInterfaceTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[ComPlusInterfaceTupleFields index] => this.Fields[(int)index];
44 42
45 public string Interface 43 public string ComPlusComponentRef
46 { 44 {
47 get => this.Fields[(int)ComPlusInterfaceTupleFields.Interface].AsString(); 45 get => this.Fields[(int)ComPlusInterfaceTupleFields.ComPlusComponentRef].AsString();
48 set => this.Set((int)ComPlusInterfaceTupleFields.Interface, value); 46 set => this.Set((int)ComPlusInterfaceTupleFields.ComPlusComponentRef, value);
49 }
50
51 public string ComPlusComponent_
52 {
53 get => this.Fields[(int)ComPlusInterfaceTupleFields.ComPlusComponent_].AsString();
54 set => this.Set((int)ComPlusInterfaceTupleFields.ComPlusComponent_, value);
55 } 47 }
56 48
57 public string IID 49 public string IID
diff --git a/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs b/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs
index 8ebc3f6b..9582ff88 100644
--- a/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusMethodPropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusMethodProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusMethodProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Method_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.MethodRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusMethodPropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusMethodPropertyTupleFields 26 public enum ComPlusMethodPropertyTupleFields
27 { 27 {
28 Method_, 28 MethodRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusMethodPropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusMethodPropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string Method_ 45 public string MethodRef
46 { 46 {
47 get => this.Fields[(int)ComPlusMethodPropertyTupleFields.Method_].AsString(); 47 get => this.Fields[(int)ComPlusMethodPropertyTupleFields.MethodRef].AsString();
48 set => this.Set((int)ComPlusMethodPropertyTupleFields.Method_, value); 48 set => this.Set((int)ComPlusMethodPropertyTupleFields.MethodRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusMethodTuple.cs b/src/wixext/Tuples/ComPlusMethodTuple.cs
index bcca034a..c2fdada7 100644
--- a/src/wixext/Tuples/ComPlusMethodTuple.cs
+++ b/src/wixext/Tuples/ComPlusMethodTuple.cs
@@ -11,8 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusMethod.ToString(), 11 ComPlusTupleDefinitionType.ComPlusMethod.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Method), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.InterfaceRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Interface_), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Index), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Index), IntermediateFieldType.Number),
17 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Name), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusMethodTupleFields.Name), IntermediateFieldType.String),
18 }, 17 },
@@ -26,8 +25,7 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusMethodTupleFields 26 public enum ComPlusMethodTupleFields
28 { 27 {
29 Method, 28 InterfaceRef,
30 Interface_,
31 Index, 29 Index,
32 Name, 30 Name,
33 } 31 }
@@ -44,16 +42,10 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusMethodTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusMethodTupleFields index] => this.Fields[(int)index];
46 44
47 public string Method 45 public string InterfaceRef
48 { 46 {
49 get => this.Fields[(int)ComPlusMethodTupleFields.Method].AsString(); 47 get => this.Fields[(int)ComPlusMethodTupleFields.InterfaceRef].AsString();
50 set => this.Set((int)ComPlusMethodTupleFields.Method, value); 48 set => this.Set((int)ComPlusMethodTupleFields.InterfaceRef, value);
51 }
52
53 public string Interface_
54 {
55 get => this.Fields[(int)ComPlusMethodTupleFields.Interface_].AsString();
56 set => this.Set((int)ComPlusMethodTupleFields.Interface_, value);
57 } 49 }
58 50
59 public int Index 51 public int Index
diff --git a/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs b/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs
index 3427b10a..9c834601 100644
--- a/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusPartitionPropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusPartitionProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusPartitionProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Partition_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.PartitionRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusPartitionPropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusPartitionPropertyTupleFields 26 public enum ComPlusPartitionPropertyTupleFields
27 { 27 {
28 Partition_, 28 PartitionRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusPartitionPropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusPartitionPropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string Partition_ 45 public string PartitionRef
46 { 46 {
47 get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.Partition_].AsString(); 47 get => this.Fields[(int)ComPlusPartitionPropertyTupleFields.PartitionRef].AsString();
48 set => this.Set((int)ComPlusPartitionPropertyTupleFields.Partition_, value); 48 set => this.Set((int)ComPlusPartitionPropertyTupleFields.PartitionRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs
index a2259cc6..51865b7d 100644
--- a/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusPartitionRoleTuple.cs
@@ -11,9 +11,8 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusPartitionRole.ToString(), 11 ComPlusTupleDefinitionType.ComPlusPartitionRole.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.PartitionRole), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.PartitionRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Partition_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Component_), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Name), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusPartitionRoleTupleFields.Name), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusPartitionRoleTuple)); 18 typeof(ComPlusPartitionRoleTuple));
@@ -26,9 +25,8 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusPartitionRoleTupleFields 26 public enum ComPlusPartitionRoleTupleFields
28 { 27 {
29 PartitionRole, 28 PartitionRef,
30 Partition_, 29 ComponentRef,
31 Component_,
32 Name, 30 Name,
33 } 31 }
34 32
@@ -44,22 +42,16 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusPartitionRoleTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusPartitionRoleTupleFields index] => this.Fields[(int)index];
46 44
47 public string PartitionRole 45 public string PartitionRef
48 { 46 {
49 get => this.Fields[(int)ComPlusPartitionRoleTupleFields.PartitionRole].AsString(); 47 get => this.Fields[(int)ComPlusPartitionRoleTupleFields.PartitionRef].AsString();
50 set => this.Set((int)ComPlusPartitionRoleTupleFields.PartitionRole, value); 48 set => this.Set((int)ComPlusPartitionRoleTupleFields.PartitionRef, value);
51 } 49 }
52 50
53 public string Partition_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Partition_].AsString(); 53 get => this.Fields[(int)ComPlusPartitionRoleTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusPartitionRoleTupleFields.Partition_, value); 54 set => this.Set((int)ComPlusPartitionRoleTupleFields.ComponentRef, value);
57 }
58
59 public string Component_
60 {
61 get => this.Fields[(int)ComPlusPartitionRoleTupleFields.Component_].AsString();
62 set => this.Set((int)ComPlusPartitionRoleTupleFields.Component_, value);
63 } 55 }
64 56
65 public string Name 57 public string Name
diff --git a/src/wixext/Tuples/ComPlusPartitionTuple.cs b/src/wixext/Tuples/ComPlusPartitionTuple.cs
index 68de9955..0b7417dd 100644
--- a/src/wixext/Tuples/ComPlusPartitionTuple.cs
+++ b/src/wixext/Tuples/ComPlusPartitionTuple.cs
@@ -11,9 +11,8 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusPartition.ToString(), 11 ComPlusTupleDefinitionType.ComPlusPartition.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Partition), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Component_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.PartitionId), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.CustomId), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Name), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusPartitionTupleFields.Name), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusPartitionTuple)); 18 typeof(ComPlusPartitionTuple));
@@ -26,9 +25,8 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusPartitionTupleFields 26 public enum ComPlusPartitionTupleFields
28 { 27 {
29 Partition, 28 ComponentRef,
30 Component_, 29 PartitionId,
31 CustomId,
32 Name, 30 Name,
33 } 31 }
34 32
@@ -44,22 +42,16 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusPartitionTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusPartitionTupleFields index] => this.Fields[(int)index];
46 44
47 public string Partition 45 public string ComponentRef
48 { 46 {
49 get => this.Fields[(int)ComPlusPartitionTupleFields.Partition].AsString(); 47 get => this.Fields[(int)ComPlusPartitionTupleFields.ComponentRef].AsString();
50 set => this.Set((int)ComPlusPartitionTupleFields.Partition, value); 48 set => this.Set((int)ComPlusPartitionTupleFields.ComponentRef, value);
51 } 49 }
52 50
53 public string Component_ 51 public string PartitionId
54 { 52 {
55 get => this.Fields[(int)ComPlusPartitionTupleFields.Component_].AsString(); 53 get => this.Fields[(int)ComPlusPartitionTupleFields.PartitionId].AsString();
56 set => this.Set((int)ComPlusPartitionTupleFields.Component_, value); 54 set => this.Set((int)ComPlusPartitionTupleFields.PartitionId, value);
57 }
58
59 public string CustomId
60 {
61 get => this.Fields[(int)ComPlusPartitionTupleFields.CustomId].AsString();
62 set => this.Set((int)ComPlusPartitionTupleFields.CustomId, value);
63 } 55 }
64 56
65 public string Name 57 public string Name
diff --git a/src/wixext/Tuples/ComPlusPartitionUserTuple.cs b/src/wixext/Tuples/ComPlusPartitionUserTuple.cs
index 33a58d38..052b1746 100644
--- a/src/wixext/Tuples/ComPlusPartitionUserTuple.cs
+++ b/src/wixext/Tuples/ComPlusPartitionUserTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusPartitionUser.ToString(), 11 ComPlusTupleDefinitionType.ComPlusPartitionUser.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.PartitionUser), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.PartitionRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.Partition_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.UserRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusPartitionUserTupleFields.User_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusPartitionUserTuple)); 18 typeof(ComPlusPartitionUserTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusPartitionUserTupleFields 26 public enum ComPlusPartitionUserTupleFields
28 { 27 {
29 PartitionUser, 28 PartitionRef,
30 Partition_, 29 ComponentRef,
31 Component_, 30 UserRef,
32 User_,
33 } 31 }
34 32
35 public class ComPlusPartitionUserTuple : IntermediateTuple 33 public class ComPlusPartitionUserTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusPartitionUserTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusPartitionUserTupleFields index] => this.Fields[(int)index];
46 44
47 public string PartitionUser 45 public string PartitionRef
48 { 46 {
49 get => this.Fields[(int)ComPlusPartitionUserTupleFields.PartitionUser].AsString(); 47 get => this.Fields[(int)ComPlusPartitionUserTupleFields.PartitionRef].AsString();
50 set => this.Set((int)ComPlusPartitionUserTupleFields.PartitionUser, value); 48 set => this.Set((int)ComPlusPartitionUserTupleFields.PartitionRef, value);
51 } 49 }
52 50
53 public string Partition_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusPartitionUserTupleFields.Partition_].AsString(); 53 get => this.Fields[(int)ComPlusPartitionUserTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusPartitionUserTupleFields.Partition_, value); 54 set => this.Set((int)ComPlusPartitionUserTupleFields.ComponentRef, value);
57 } 55 }
58 56
59 public string Component_ 57 public string UserRef
60 { 58 {
61 get => this.Fields[(int)ComPlusPartitionUserTupleFields.Component_].AsString(); 59 get => this.Fields[(int)ComPlusPartitionUserTupleFields.UserRef].AsString();
62 set => this.Set((int)ComPlusPartitionUserTupleFields.Component_, value); 60 set => this.Set((int)ComPlusPartitionUserTupleFields.UserRef, value);
63 }
64
65 public string User_
66 {
67 get => this.Fields[(int)ComPlusPartitionUserTupleFields.User_].AsString();
68 set => this.Set((int)ComPlusPartitionUserTupleFields.User_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs b/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs
index 75d8cfaf..8cf0b8d5 100644
--- a/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs
+++ b/src/wixext/Tuples/ComPlusRoleForComponentTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusRoleForComponent.ToString(), 11 ComPlusTupleDefinitionType.ComPlusRoleForComponent.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.RoleForComponent), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComPlusComponent_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ApplicationRole_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.ComponentRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusRoleForComponentTupleFields.Component_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusRoleForComponentTuple)); 18 typeof(ComPlusRoleForComponentTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusRoleForComponentTupleFields 26 public enum ComPlusRoleForComponentTupleFields
28 { 27 {
29 RoleForComponent, 28 ComPlusComponentRef,
30 ComPlusComponent_, 29 ApplicationRoleRef,
31 ApplicationRole_, 30 ComponentRef,
32 Component_,
33 } 31 }
34 32
35 public class ComPlusRoleForComponentTuple : IntermediateTuple 33 public class ComPlusRoleForComponentTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusRoleForComponentTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusRoleForComponentTupleFields index] => this.Fields[(int)index];
46 44
47 public string RoleForComponent 45 public string ComPlusComponentRef
48 { 46 {
49 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.RoleForComponent].AsString(); 47 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComPlusComponentRef].AsString();
50 set => this.Set((int)ComPlusRoleForComponentTupleFields.RoleForComponent, value); 48 set => this.Set((int)ComPlusRoleForComponentTupleFields.ComPlusComponentRef, value);
51 } 49 }
52 50
53 public string ComPlusComponent_ 51 public string ApplicationRoleRef
54 { 52 {
55 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComPlusComponent_].AsString(); 53 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ApplicationRoleRef].AsString();
56 set => this.Set((int)ComPlusRoleForComponentTupleFields.ComPlusComponent_, value); 54 set => this.Set((int)ComPlusRoleForComponentTupleFields.ApplicationRoleRef, value);
57 } 55 }
58 56
59 public string ApplicationRole_ 57 public string ComponentRef
60 { 58 {
61 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ApplicationRole_].AsString(); 59 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.ComponentRef].AsString();
62 set => this.Set((int)ComPlusRoleForComponentTupleFields.ApplicationRole_, value); 60 set => this.Set((int)ComPlusRoleForComponentTupleFields.ComponentRef, value);
63 }
64
65 public string Component_
66 {
67 get => this.Fields[(int)ComPlusRoleForComponentTupleFields.Component_].AsString();
68 set => this.Set((int)ComPlusRoleForComponentTupleFields.Component_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs b/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs
index 139417d3..c6c5ae6b 100644
--- a/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs
+++ b/src/wixext/Tuples/ComPlusRoleForInterfaceTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusRoleForInterface.ToString(), 11 ComPlusTupleDefinitionType.ComPlusRoleForInterface.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.RoleForInterface), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.InterfaceRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.Interface_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ApplicationRole_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.ComponentRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusRoleForInterfaceTupleFields.Component_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusRoleForInterfaceTuple)); 18 typeof(ComPlusRoleForInterfaceTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusRoleForInterfaceTupleFields 26 public enum ComPlusRoleForInterfaceTupleFields
28 { 27 {
29 RoleForInterface, 28 InterfaceRef,
30 Interface_, 29 ApplicationRoleRef,
31 ApplicationRole_, 30 ComponentRef,
32 Component_,
33 } 31 }
34 32
35 public class ComPlusRoleForInterfaceTuple : IntermediateTuple 33 public class ComPlusRoleForInterfaceTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusRoleForInterfaceTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusRoleForInterfaceTupleFields index] => this.Fields[(int)index];
46 44
47 public string RoleForInterface 45 public string InterfaceRef
48 { 46 {
49 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.RoleForInterface].AsString(); 47 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.InterfaceRef].AsString();
50 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.RoleForInterface, value); 48 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.InterfaceRef, value);
51 } 49 }
52 50
53 public string Interface_ 51 public string ApplicationRoleRef
54 { 52 {
55 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.Interface_].AsString(); 53 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef].AsString();
56 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.Interface_, value); 54 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ApplicationRoleRef, value);
57 } 55 }
58 56
59 public string ApplicationRole_ 57 public string ComponentRef
60 { 58 {
61 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ApplicationRole_].AsString(); 59 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.ComponentRef].AsString();
62 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ApplicationRole_, value); 60 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.ComponentRef, value);
63 }
64
65 public string Component_
66 {
67 get => this.Fields[(int)ComPlusRoleForInterfaceTupleFields.Component_].AsString();
68 set => this.Set((int)ComPlusRoleForInterfaceTupleFields.Component_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs b/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs
index 5b6e994e..89268a33 100644
--- a/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs
+++ b/src/wixext/Tuples/ComPlusRoleForMethodTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusRoleForMethod.ToString(), 11 ComPlusTupleDefinitionType.ComPlusRoleForMethod.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.RoleForMethod), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.MethodRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.Method_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ApplicationRole_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.ComponentRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusRoleForMethodTupleFields.Component_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusRoleForMethodTuple)); 18 typeof(ComPlusRoleForMethodTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusRoleForMethodTupleFields 26 public enum ComPlusRoleForMethodTupleFields
28 { 27 {
29 RoleForMethod, 28 MethodRef,
30 Method_, 29 ApplicationRoleRef,
31 ApplicationRole_, 30 ComponentRef,
32 Component_,
33 } 31 }
34 32
35 public class ComPlusRoleForMethodTuple : IntermediateTuple 33 public class ComPlusRoleForMethodTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusRoleForMethodTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusRoleForMethodTupleFields index] => this.Fields[(int)index];
46 44
47 public string RoleForMethod 45 public string MethodRef
48 { 46 {
49 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.RoleForMethod].AsString(); 47 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.MethodRef].AsString();
50 set => this.Set((int)ComPlusRoleForMethodTupleFields.RoleForMethod, value); 48 set => this.Set((int)ComPlusRoleForMethodTupleFields.MethodRef, value);
51 } 49 }
52 50
53 public string Method_ 51 public string ApplicationRoleRef
54 { 52 {
55 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.Method_].AsString(); 53 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ApplicationRoleRef].AsString();
56 set => this.Set((int)ComPlusRoleForMethodTupleFields.Method_, value); 54 set => this.Set((int)ComPlusRoleForMethodTupleFields.ApplicationRoleRef, value);
57 } 55 }
58 56
59 public string ApplicationRole_ 57 public string ComponentRef
60 { 58 {
61 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ApplicationRole_].AsString(); 59 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.ComponentRef].AsString();
62 set => this.Set((int)ComPlusRoleForMethodTupleFields.ApplicationRole_, value); 60 set => this.Set((int)ComPlusRoleForMethodTupleFields.ComponentRef, value);
63 }
64
65 public string Component_
66 {
67 get => this.Fields[(int)ComPlusRoleForMethodTupleFields.Component_].AsString();
68 set => this.Set((int)ComPlusRoleForMethodTupleFields.Component_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs b/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs
index ad0841f4..f9b4137a 100644
--- a/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs
+++ b/src/wixext/Tuples/ComPlusSubscriptionPropertyTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusSubscriptionProperty.ToString(), 11 ComPlusTupleDefinitionType.ComPlusSubscriptionProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Subscription_), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.SubscriptionRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionPropertyTupleFields.Value), IntermediateFieldType.String),
17 }, 17 },
@@ -25,7 +25,7 @@ namespace WixToolset.ComPlus.Tuples
25 25
26 public enum ComPlusSubscriptionPropertyTupleFields 26 public enum ComPlusSubscriptionPropertyTupleFields
27 { 27 {
28 Subscription_, 28 SubscriptionRef,
29 Name, 29 Name,
30 Value, 30 Value,
31 } 31 }
@@ -42,10 +42,10 @@ namespace WixToolset.ComPlus.Tuples
42 42
43 public IntermediateField this[ComPlusSubscriptionPropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusSubscriptionPropertyTupleFields index] => this.Fields[(int)index];
44 44
45 public string Subscription_ 45 public string SubscriptionRef
46 { 46 {
47 get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.Subscription_].AsString(); 47 get => this.Fields[(int)ComPlusSubscriptionPropertyTupleFields.SubscriptionRef].AsString();
48 set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.Subscription_, value); 48 set => this.Set((int)ComPlusSubscriptionPropertyTupleFields.SubscriptionRef, value);
49 } 49 }
50 50
51 public string Name 51 public string Name
diff --git a/src/wixext/Tuples/ComPlusSubscriptionTuple.cs b/src/wixext/Tuples/ComPlusSubscriptionTuple.cs
index fedab172..2389101a 100644
--- a/src/wixext/Tuples/ComPlusSubscriptionTuple.cs
+++ b/src/wixext/Tuples/ComPlusSubscriptionTuple.cs
@@ -12,9 +12,9 @@ namespace WixToolset.ComPlus
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Subscription), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Subscription), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComPlusComponent_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComPlusComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.ComponentRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.CustomId), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.SubscriptionId), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Name), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.Name), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.EventCLSID), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.EventCLSID), IntermediateFieldType.String),
20 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.PublisherID), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(ComPlusSubscriptionTupleFields.PublisherID), IntermediateFieldType.String),
@@ -30,9 +30,9 @@ namespace WixToolset.ComPlus.Tuples
30 public enum ComPlusSubscriptionTupleFields 30 public enum ComPlusSubscriptionTupleFields
31 { 31 {
32 Subscription, 32 Subscription,
33 ComPlusComponent_, 33 ComPlusComponentRef,
34 Component_, 34 ComponentRef,
35 CustomId, 35 SubscriptionId,
36 Name, 36 Name,
37 EventCLSID, 37 EventCLSID,
38 PublisherID, 38 PublisherID,
@@ -56,22 +56,22 @@ namespace WixToolset.ComPlus.Tuples
56 set => this.Set((int)ComPlusSubscriptionTupleFields.Subscription, value); 56 set => this.Set((int)ComPlusSubscriptionTupleFields.Subscription, value);
57 } 57 }
58 58
59 public string ComPlusComponent_ 59 public string ComPlusComponentRef
60 { 60 {
61 get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComPlusComponent_].AsString(); 61 get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComPlusComponentRef].AsString();
62 set => this.Set((int)ComPlusSubscriptionTupleFields.ComPlusComponent_, value); 62 set => this.Set((int)ComPlusSubscriptionTupleFields.ComPlusComponentRef, value);
63 } 63 }
64 64
65 public string Component_ 65 public string ComponentRef
66 { 66 {
67 get => this.Fields[(int)ComPlusSubscriptionTupleFields.Component_].AsString(); 67 get => this.Fields[(int)ComPlusSubscriptionTupleFields.ComponentRef].AsString();
68 set => this.Set((int)ComPlusSubscriptionTupleFields.Component_, value); 68 set => this.Set((int)ComPlusSubscriptionTupleFields.ComponentRef, value);
69 } 69 }
70 70
71 public string CustomId 71 public string SubscriptionId
72 { 72 {
73 get => this.Fields[(int)ComPlusSubscriptionTupleFields.CustomId].AsString(); 73 get => this.Fields[(int)ComPlusSubscriptionTupleFields.SubscriptionId].AsString();
74 set => this.Set((int)ComPlusSubscriptionTupleFields.CustomId, value); 74 set => this.Set((int)ComPlusSubscriptionTupleFields.SubscriptionId, value);
75 } 75 }
76 76
77 public string Name 77 public string Name
diff --git a/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs b/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs
index 3916c0ee..2836951b 100644
--- a/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusUserInApplicationRoleTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusUserInApplicationRole.ToString(), 11 ComPlusTupleDefinitionType.ComPlusUserInApplicationRole.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.UserInApplicationRole), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ApplicationRole_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.UserRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusUserInApplicationRoleTupleFields.User_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusUserInApplicationRoleTuple)); 18 typeof(ComPlusUserInApplicationRoleTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusUserInApplicationRoleTupleFields 26 public enum ComPlusUserInApplicationRoleTupleFields
28 { 27 {
29 UserInApplicationRole, 28 ApplicationRoleRef,
30 ApplicationRole_, 29 ComponentRef,
31 Component_, 30 UserRef,
32 User_,
33 } 31 }
34 32
35 public class ComPlusUserInApplicationRoleTuple : IntermediateTuple 33 public class ComPlusUserInApplicationRoleTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusUserInApplicationRoleTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusUserInApplicationRoleTupleFields index] => this.Fields[(int)index];
46 44
47 public string UserInApplicationRole 45 public string ApplicationRoleRef
48 { 46 {
49 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.UserInApplicationRole].AsString(); 47 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef].AsString();
50 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.UserInApplicationRole, value); 48 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ApplicationRoleRef, value);
51 } 49 }
52 50
53 public string ApplicationRole_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ApplicationRole_].AsString(); 53 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ApplicationRole_, value); 54 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.ComponentRef, value);
57 } 55 }
58 56
59 public string Component_ 57 public string UserRef
60 { 58 {
61 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.Component_].AsString(); 59 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.UserRef].AsString();
62 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.Component_, value); 60 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.UserRef, value);
63 }
64
65 public string User_
66 {
67 get => this.Fields[(int)ComPlusUserInApplicationRoleTupleFields.User_].AsString();
68 set => this.Set((int)ComPlusUserInApplicationRoleTupleFields.User_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs
index 06d742b8..77850648 100644
--- a/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusUserInPartitionRoleTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
11 ComPlusTupleDefinitionType.ComPlusUserInPartitionRole.ToString(), 11 ComPlusTupleDefinitionType.ComPlusUserInPartitionRole.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.UserInPartitionRole), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.PartitionRole_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.UserRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(ComPlusUserInPartitionRoleTupleFields.User_), IntermediateFieldType.String),
18 }, 17 },
19 typeof(ComPlusUserInPartitionRoleTuple)); 18 typeof(ComPlusUserInPartitionRoleTuple));
20 } 19 }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
26 25
27 public enum ComPlusUserInPartitionRoleTupleFields 26 public enum ComPlusUserInPartitionRoleTupleFields
28 { 27 {
29 UserInPartitionRole, 28 PartitionRoleRef,
30 PartitionRole_, 29 ComponentRef,
31 Component_, 30 UserRef,
32 User_,
33 } 31 }
34 32
35 public class ComPlusUserInPartitionRoleTuple : IntermediateTuple 33 public class ComPlusUserInPartitionRoleTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
44 42
45 public IntermediateField this[ComPlusUserInPartitionRoleTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[ComPlusUserInPartitionRoleTupleFields index] => this.Fields[(int)index];
46 44
47 public string UserInPartitionRole 45 public string PartitionRoleRef
48 { 46 {
49 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.UserInPartitionRole].AsString(); 47 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef].AsString();
50 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.UserInPartitionRole, value); 48 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.PartitionRoleRef, value);
51 } 49 }
52 50
53 public string PartitionRole_ 51 public string ComponentRef
54 { 52 {
55 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.PartitionRole_].AsString(); 53 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.ComponentRef].AsString();
56 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.PartitionRole_, value); 54 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.ComponentRef, value);
57 } 55 }
58 56
59 public string Component_ 57 public string UserRef
60 { 58 {
61 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.Component_].AsString(); 59 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.UserRef].AsString();
62 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.Component_, value); 60 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.UserRef, value);
63 }
64
65 public string User_
66 {
67 get => this.Fields[(int)ComPlusUserInPartitionRoleTupleFields.User_].AsString();
68 set => this.Set((int)ComPlusUserInPartitionRoleTupleFields.User_, value);
69 } 61 }
70 } 62 }
71} \ No newline at end of file 63} \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-11 14:29:39 +0000