diff options
Diffstat (limited to '')
-rw-r--r-- | src/wixext/Tuples/ComPlusComponentTuple.cs | 18 |
1 files changed, 5 insertions, 13 deletions
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 |