From ef6485ac4a03333701d343c1e3a52d25805c58f1 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 8 May 2019 13:35:21 -0700 Subject: Add additional strongly typed tuples --- src/WixToolset.Data/Tuples/CompLocatorTuple.cs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/WixToolset.Data/Tuples/CompLocatorTuple.cs') diff --git a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs index e8560711..37bc2a37 100644 --- a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs +++ b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs @@ -10,7 +10,6 @@ namespace WixToolset.Data TupleDefinitionType.CompLocator, new[] { - new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Signature_), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.ComponentId), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Type), IntermediateFieldType.Number), }, @@ -22,7 +21,6 @@ namespace WixToolset.Data.Tuples { public enum CompLocatorTupleFields { - Signature_, ComponentId, Type, } @@ -39,22 +37,16 @@ namespace WixToolset.Data.Tuples public IntermediateField this[CompLocatorTupleFields index] => this.Fields[(int)index]; - public string Signature_ - { - get => (string)this.Fields[(int)CompLocatorTupleFields.Signature_]?.Value; - set => this.Set((int)CompLocatorTupleFields.Signature_, value); - } - public string ComponentId { get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId]?.Value; set => this.Set((int)CompLocatorTupleFields.ComponentId, value); } - public int Type + public LocatorType Type { - get => (int)this.Fields[(int)CompLocatorTupleFields.Type]?.Value; - set => this.Set((int)CompLocatorTupleFields.Type, value); + get => (LocatorType)this.Fields[(int)CompLocatorTupleFields.Type].AsNumber(); + set => this.Set((int)CompLocatorTupleFields.Type, (int)value); } } } \ No newline at end of file -- cgit v1.2.3-55-g6feb