diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-03-27 15:35:54 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-03-30 21:23:16 +1000 |
| commit | afaa41df8ac183e25051199ff8e993fa81cce6e2 (patch) | |
| tree | 3841d7eca59795cfd7ff2ea38514ff5baf4a081d /src/WixToolset.Data/Tuples | |
| parent | 70bf83df639289f550ddba22c9e8c85208fb188f (diff) | |
| download | wix-afaa41df8ac183e25051199ff8e993fa81cce6e2.tar.gz wix-afaa41df8ac183e25051199ff8e993fa81cce6e2.tar.bz2 wix-afaa41df8ac183e25051199ff8e993fa81cce6e2.zip | |
Add support for sorting WixSearches in Core.
Move error message CircularSearchReference here from UtilExtension.
Remove redundant id field from WixSearchRelationTuple.
Diffstat (limited to 'src/WixToolset.Data/Tuples')
| -rw-r--r-- | src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs index 9c9b4662..559a41fa 100644 --- a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs +++ b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs | |||
| @@ -10,7 +10,6 @@ namespace WixToolset.Data | |||
| 10 | TupleDefinitionType.WixSearchRelation, | 10 | TupleDefinitionType.WixSearchRelation, |
| 11 | new[] | 11 | new[] |
| 12 | { | 12 | { |
| 13 | new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.WixSearchRef), IntermediateFieldType.String), | ||
| 14 | new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentSearchRef), IntermediateFieldType.String), | 13 | new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentSearchRef), IntermediateFieldType.String), |
| 15 | new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number), | 14 | new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number), |
| 16 | }, | 15 | }, |
| @@ -22,7 +21,6 @@ namespace WixToolset.Data.Tuples | |||
| 22 | { | 21 | { |
| 23 | public enum WixSearchRelationTupleFields | 22 | public enum WixSearchRelationTupleFields |
| 24 | { | 23 | { |
| 25 | WixSearchRef, | ||
| 26 | ParentSearchRef, | 24 | ParentSearchRef, |
| 27 | Attributes, | 25 | Attributes, |
| 28 | } | 26 | } |
| @@ -39,12 +37,6 @@ namespace WixToolset.Data.Tuples | |||
| 39 | 37 | ||
| 40 | public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index]; | 38 | public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index]; |
| 41 | 39 | ||
| 42 | public string WixSearchRef | ||
| 43 | { | ||
| 44 | get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearchRef]; | ||
| 45 | set => this.Set((int)WixSearchRelationTupleFields.WixSearchRef, value); | ||
| 46 | } | ||
| 47 | |||
| 48 | public string ParentSearchRef | 40 | public string ParentSearchRef |
| 49 | { | 41 | { |
| 50 | get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentSearchRef]; | 42 | get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentSearchRef]; |
