diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-22 00:19:41 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-05-23 15:43:40 -0700 |
| commit | 54541ef517190f37d0625627b028834f0871a959 (patch) | |
| tree | 91ff4d813d5013260c04854a9ad24812ccdffa08 /src/WixToolset.Data/Tuples/WixMergeTuple.cs | |
| parent | 505fe69d85c90184cd37290ccb0120fec6074c20 (diff) | |
| download | wix-54541ef517190f37d0625627b028834f0871a959.tar.gz wix-54541ef517190f37d0625627b028834f0871a959.tar.bz2 wix-54541ef517190f37d0625627b028834f0871a959.zip | |
Implement many more strong tuples
Also fixes several warnings.
Diffstat (limited to 'src/WixToolset.Data/Tuples/WixMergeTuple.cs')
| -rw-r--r-- | src/WixToolset.Data/Tuples/WixMergeTuple.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs index 6c5120b5..51c55a85 100644 --- a/src/WixToolset.Data/Tuples/WixMergeTuple.cs +++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs | |||
| @@ -10,7 +10,6 @@ namespace WixToolset.Data | |||
| 10 | TupleDefinitionType.WixMerge, | 10 | TupleDefinitionType.WixMerge, |
| 11 | new[] | 11 | new[] |
| 12 | { | 12 | { |
| 13 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.WixMerge), IntermediateFieldType.String), | ||
| 14 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number), | 13 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number), |
| 15 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String), | 14 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String), |
| 16 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path), | 15 | new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path), |
| @@ -27,7 +26,6 @@ namespace WixToolset.Data.Tuples | |||
| 27 | { | 26 | { |
| 28 | public enum WixMergeTupleFields | 27 | public enum WixMergeTupleFields |
| 29 | { | 28 | { |
| 30 | WixMerge, | ||
| 31 | Language, | 29 | Language, |
| 32 | Directory_, | 30 | Directory_, |
| 33 | SourceFile, | 31 | SourceFile, |
| @@ -49,12 +47,6 @@ namespace WixToolset.Data.Tuples | |||
| 49 | 47 | ||
| 50 | public IntermediateField this[WixMergeTupleFields index] => this.Fields[(int)index]; | 48 | public IntermediateField this[WixMergeTupleFields index] => this.Fields[(int)index]; |
| 51 | 49 | ||
| 52 | public string WixMerge | ||
| 53 | { | ||
| 54 | get => (string)this.Fields[(int)WixMergeTupleFields.WixMerge]; | ||
| 55 | set => this.Set((int)WixMergeTupleFields.WixMerge, value); | ||
| 56 | } | ||
| 57 | |||
| 58 | public int Language | 50 | public int Language |
| 59 | { | 51 | { |
| 60 | get => (int)this.Fields[(int)WixMergeTupleFields.Language]; | 52 | get => (int)this.Fields[(int)WixMergeTupleFields.Language]; |
| @@ -97,4 +89,4 @@ namespace WixToolset.Data.Tuples | |||
| 97 | set => this.Set((int)WixMergeTupleFields.Feature_, value); | 89 | set => this.Set((int)WixMergeTupleFields.Feature_, value); |
| 98 | } | 90 | } |
| 99 | } | 91 | } |
| 100 | } \ No newline at end of file | 92 | } |
