aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-10-16 16:58:55 -0700
committerRob Mensching <rob@firegiant.com>2019-10-18 11:29:59 -0700
commitc5bae04ebcf3cae706ca3bc2717ff3d59ec04824 (patch)
tree6f1647fcabeb4d71ecb4ab87b9bca603de12de97
parent8e55f76d9dccc15c8230a8acd426a8958e856740 (diff)
downloadwix-c5bae04ebcf3cae706ca3bc2717ff3d59ec04824.tar.gz
wix-c5bae04ebcf3cae706ca3bc2717ff3d59ec04824.tar.bz2
wix-c5bae04ebcf3cae706ca3bc2717ff3d59ec04824.zip
Minor tuple fixes
-rw-r--r--src/WixToolset.Data/IntermediateFieldExtensions.cs2
-rw-r--r--src/WixToolset.Data/Tuples/WixFragmentTuple.cs12
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
441 } 441 }
442 else 442 else
443 { 443 {
444 throw new ArgumentException($"Cannot convert string '{value}' to a 'number' field type.", nameof(value)); 444 throw new ArgumentException($"Cannot convert string '{value}' to a 'number' field type.", field.Name);
445 } 445 }
446 break; 446 break;
447 447
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
8 { 8 {
9 public static readonly IntermediateTupleDefinition WixFragment = new IntermediateTupleDefinition( 9 public static readonly IntermediateTupleDefinition WixFragment = new IntermediateTupleDefinition(
10 TupleDefinitionType.WixFragment, 10 TupleDefinitionType.WixFragment,
11 new[] 11 new IntermediateFieldDefinition[0],
12 {
13 new IntermediateFieldDefinition(nameof(WixFragmentTupleFields.WixFragment), IntermediateFieldType.String),
14 },
15 typeof(WixFragmentTuple)); 12 typeof(WixFragmentTuple));
16 } 13 }
17} 14}
@@ -20,7 +17,6 @@ namespace WixToolset.Data.Tuples
20{ 17{
21 public enum WixFragmentTupleFields 18 public enum WixFragmentTupleFields
22 { 19 {
23 WixFragment,
24 } 20 }
25 21
26 public class WixFragmentTuple : IntermediateTuple 22 public class WixFragmentTuple : IntermediateTuple
@@ -34,11 +30,5 @@ namespace WixToolset.Data.Tuples
34 } 30 }
35 31
36 public IntermediateField this[WixFragmentTupleFields index] => this.Fields[(int)index]; 32 public IntermediateField this[WixFragmentTupleFields index] => this.Fields[(int)index];
37
38 public string WixFragment
39 {
40 get => (string)this.Fields[(int)WixFragmentTupleFields.WixFragment];
41 set => this.Set((int)WixFragmentTupleFields.WixFragment, value);
42 }
43 } 33 }
44} \ No newline at end of file 34} \ No newline at end of file