Fix AppSearch related tuples
Rob Mensching committed
Oct 7, 2019 at 13:20 UTC
3eb21f9eba6e3fd9ab7902cdfe6cb4971244f6b6
4 files changed
+17
-17
src/WixToolset.Data/Tuples/AppSearchTuple.cs
+5
-5
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.AppSearch,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Property), IntermediateFieldType.String),
13
+ new IntermediateFieldDefinition(nameof(AppSearchTupleFields.PropertyRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(AppSearchTupleFields.SignatureRef), IntermediateFieldType.String),
15
},
16
typeof(AppSearchTuple));
@@ -21,7 +21,7 @@ namespace WixToolset.Data.Tuples
21
{
22
public enum AppSearchTupleFields
23
{
24
- Property,
24
+ PropertyRef,
25
SignatureRef,
26
}
27
@@ -37,10 +37,10 @@ namespace WixToolset.Data.Tuples
37
38
public IntermediateField this[AppSearchTupleFields index] => this.Fields[(int)index];
39
40
- public string Property
40
+ public string PropertyRef
41
{
42
- get => (string)this.Fields[(int)AppSearchTupleFields.Property];
43
- set => this.Set((int)AppSearchTupleFields.Property, value);
42
+ get => (string)this.Fields[(int)AppSearchTupleFields.PropertyRef];
43
+ set => this.Set((int)AppSearchTupleFields.PropertyRef, value);
44
}
45
46
public string SignatureRef
src/WixToolset.Data/Tuples/CompLocatorTuple.cs
+8
@@ -10,6 +10,7 @@ namespace WixToolset.Data
10
TupleDefinitionType.CompLocator,
11
new[]
12
{
13
+ new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.ComponentId), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Type), IntermediateFieldType.Number),
16
},
@@ -21,6 +22,7 @@ namespace WixToolset.Data.Tuples
22
{
23
public enum CompLocatorTupleFields
24
{
25
+ SignatureRef,
26
ComponentId,
27
Type,
28
}
@@ -37,6 +39,12 @@ namespace WixToolset.Data.Tuples
39
40
public IntermediateField this[CompLocatorTupleFields index] => this.Fields[(int)index];
41
42
+ public string SignatureRef
43
+ {
44
+ get => (string)this.Fields[(int)IniLocatorTupleFields.SignatureRef];
45
+ set => this.Set((int)IniLocatorTupleFields.SignatureRef, value);
46
+ }
47
+
48
public string ComponentId
49
{
50
get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId];
src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+4
-4
@@ -69,15 +69,15 @@ namespace WixToolset.Data.Tuples
69
set => this.Set((int)IniLocatorTupleFields.Key, value);
70
}
71
72
- public int Field
72
+ public int? Field
73
{
74
- get => (int)this.Fields[(int)IniLocatorTupleFields.Field];
74
+ get => (int?)this.Fields[(int)IniLocatorTupleFields.Field];
75
set => this.Set((int)IniLocatorTupleFields.Field, value);
76
}
77
78
- public int Type
78
+ public int? Type
79
{
80
- get => (int)this.Fields[(int)IniLocatorTupleFields.Type];
80
+ get => this.Fields[(int)IniLocatorTupleFields.Type].AsNullableNumber();
81
set => this.Set((int)IniLocatorTupleFields.Type, value);
82
}
83
}
src/WixToolset.Data/Tuples/SignatureTuple.cs
-8
@@ -10,7 +10,6 @@ namespace WixToolset.Data
10
TupleDefinitionType.Signature,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(SignatureTupleFields.Signature), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(SignatureTupleFields.FileName), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinVersion), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxVersion), IntermediateFieldType.String),
@@ -28,7 +27,6 @@ namespace WixToolset.Data.Tuples
27
{
28
public enum SignatureTupleFields
29
{
31
- Signature,
30
FileName,
31
MinVersion,
32
MaxVersion,
@@ -51,12 +49,6 @@ namespace WixToolset.Data.Tuples
49
50
public IntermediateField this[SignatureTupleFields index] => this.Fields[(int)index];
51
54
- public string Signature
55
- {
56
- get => (string)this.Fields[(int)SignatureTupleFields.Signature];
57
- set => this.Set((int)SignatureTupleFields.Signature, value);
58
- }
59
-
52
public string FileName
53
{
54
get => (string)this.Fields[(int)SignatureTupleFields.FileName];