Fix AppSearch related tuples

4 files changed, 17 insertions, 17 deletions

diff --git a/src/WixToolset.Data/Tuples/AppSearchTuple.cs b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
index 5c972fa0..098b4946 100644
--- a/src/WixToolset.Data/Tuples/AppSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.AppSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.PropertyRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(AppSearchTupleFields.SignatureRef), IntermediateFieldType.String),
             },
             typeof(AppSearchTuple));
@@ -21,7 +21,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum AppSearchTupleFields
     {
-        Property,
+        PropertyRef,
         SignatureRef,
     }
 
@@ -37,10 +37,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[AppSearchTupleFields index] => this.Fields[(int)index];
 
-        public string Property
+        public string PropertyRef
         {
-            get => (string)this.Fields[(int)AppSearchTupleFields.Property];
-            set => this.Set((int)AppSearchTupleFields.Property, value);
+            get => (string)this.Fields[(int)AppSearchTupleFields.PropertyRef];
+            set => this.Set((int)AppSearchTupleFields.PropertyRef, value);
         }
 
         public string SignatureRef
diff --git a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
index 4a92d132..746d3073 100644
--- a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
@@ -10,6 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.CompLocator,
             new[]
             {
+                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.ComponentId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Type), IntermediateFieldType.Number),
             },
@@ -21,6 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum CompLocatorTupleFields
     {
+        SignatureRef,
         ComponentId,
         Type,
     }
@@ -37,6 +39,12 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[CompLocatorTupleFields index] => this.Fields[(int)index];
 
+        public string SignatureRef
+        {
+            get => (string)this.Fields[(int)IniLocatorTupleFields.SignatureRef];
+            set => this.Set((int)IniLocatorTupleFields.SignatureRef, value);
+        }
+
         public string ComponentId
         {
             get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId];
diff --git a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
index b95bcdf2..0bb670c6 100644
--- a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
@@ -69,15 +69,15 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)IniLocatorTupleFields.Key, value);
         }
 
-        public int Field
+        public int? Field
         {
-            get => (int)this.Fields[(int)IniLocatorTupleFields.Field];
+            get => (int?)this.Fields[(int)IniLocatorTupleFields.Field];
             set => this.Set((int)IniLocatorTupleFields.Field, value);
         }
 
-        public int Type
+        public int? Type
         {
-            get => (int)this.Fields[(int)IniLocatorTupleFields.Type];
+            get => this.Fields[(int)IniLocatorTupleFields.Type].AsNullableNumber();
             set => this.Set((int)IniLocatorTupleFields.Type, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/SignatureTuple.cs b/src/WixToolset.Data/Tuples/SignatureTuple.cs
index 59c40d99..db380bb6 100644
--- a/src/WixToolset.Data/Tuples/SignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/SignatureTuple.cs
@@ -10,7 +10,6 @@ namespace WixToolset.Data
             TupleDefinitionType.Signature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.Signature), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(SignatureTupleFields.FileName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinVersion), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxVersion), IntermediateFieldType.String),
@@ -28,7 +27,6 @@ namespace WixToolset.Data.Tuples
 {
     public enum SignatureTupleFields
     {
-        Signature,
         FileName,
         MinVersion,
         MaxVersion,
@@ -51,12 +49,6 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[SignatureTupleFields index] => this.Fields[(int)index];
 
-        public string Signature
-        {
-            get => (string)this.Fields[(int)SignatureTupleFields.Signature];
-            set => this.Set((int)SignatureTupleFields.Signature, value);
-        }
-
         public string FileName
         {
             get => (string)this.Fields[(int)SignatureTupleFields.FileName];