From c5bae04ebcf3cae706ca3bc2717ff3d59ec04824 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 16 Oct 2019 16:58:55 -0700 Subject: Minor tuple fixes --- src/WixToolset.Data/IntermediateFieldExtensions.cs | 2 +- src/WixToolset.Data/Tuples/WixFragmentTuple.cs | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/WixToolset.Data/IntermediateFieldExtensions.cs b/src/WixToolset.Data/IntermediateFieldExtensions.cs index 5d2ddf06..e488866e 100644 --- a/src/WixToolset.Data/IntermediateFieldExtensions.cs +++ b/src/WixToolset.Data/IntermediateFieldExtensions.cs @@ -441,7 +441,7 @@ namespace WixToolset.Data } else { - throw new ArgumentException($"Cannot convert string '{value}' to a 'number' field type.", nameof(value)); + throw new ArgumentException($"Cannot convert string '{value}' to a 'number' field type.", field.Name); } break; diff --git a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs index fd4c309d..fedfa872 100644 --- a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs +++ b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs @@ -8,10 +8,7 @@ namespace WixToolset.Data { public static readonly IntermediateTupleDefinition WixFragment = new IntermediateTupleDefinition( TupleDefinitionType.WixFragment, - new[] - { - new IntermediateFieldDefinition(nameof(WixFragmentTupleFields.WixFragment), IntermediateFieldType.String), - }, + new IntermediateFieldDefinition[0], typeof(WixFragmentTuple)); } } @@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples { public enum WixFragmentTupleFields { - WixFragment, } public class WixFragmentTuple : IntermediateTuple @@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples } public IntermediateField this[WixFragmentTupleFields index] => this.Fields[(int)index]; - - public string WixFragment - { - get => (string)this.Fields[(int)WixFragmentTupleFields.WixFragment]; - set => this.Set((int)WixFragmentTupleFields.WixFragment, value); - } } } \ No newline at end of file -- cgit v1.2.3-55-g6feb