Fix AppSearch related building

3 files changed, 15 insertions, 8 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index cd3a67fa..170b138d 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -152,6 +152,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 case TupleDefinitionType.Shortcut:
                     this.AddShortcutTuple((ShortcutTuple)tuple, output);
                     break;
+                        
+                case TupleDefinitionType.Signature:
+                    this.AddTupleDefaultly(tuple, output, true);
+                    break;
 
                 case TupleDefinitionType.SummaryInformation:
                     this.AddTupleDefaultly(tuple, output, tableName: "_SummaryInformation");
@@ -917,7 +921,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 if (i < tableDefinition.Columns.Length)
                 {
-                    var column = tableDefinition.Columns[i];
+                    var column = tableDefinition.Columns[i + rowOffset];
 
                     switch (column.Type)
                     {
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 3ee87872..c4bbf86d 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -322,8 +322,9 @@ namespace WixToolset.Core
                     this.Core.Write(ErrorMessages.SearchPropertyNotUppercase(sourceLineNumbers, "Property", "Id", propertyId.Id));
                 }
 
-                var tuple = new AppSearchTuple(sourceLineNumbers, propertyId)
+                var tuple = new AppSearchTuple(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature))
                 {
+                    PropertyRef = propertyId.Id,
                     SignatureRef = signature
                 };
 
@@ -2905,6 +2906,7 @@ namespace WixToolset.Core
             {
                 var tuple = new CompLocatorTuple(sourceLineNumbers, id)
                 {
+                    SignatureRef = id.Id,
                     ComponentId = componentId,
                     Type = type,
                 };
@@ -4482,7 +4484,7 @@ namespace WixToolset.Core
                     signature = id.Id;
                 }
 
-                var tuple = new DrLocatorTuple(sourceLineNumbers)
+                var tuple = new DrLocatorTuple(sourceLineNumbers, new Identifier(access, rowId, parentSignature, path))
                 {
                     SignatureRef = rowId,
                     Parent = parentSignature,
@@ -6793,6 +6795,7 @@ namespace WixToolset.Core
             {
                 var tuple = new IniLocatorTuple(sourceLineNumbers, id)
                 {
+                    SignatureRef = id.Id,
                     FileName = this.GetMsiFilenameValue(shortName, name),
                     Section = section,
                     Key = key,
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 826d8985..6ff4e237 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
 
     public class MsiQueryFixture
     {
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesAppSearchTablesFromComponentSearch()
         {
             var folder = TestData.Get(@"TestData");
@@ -43,7 +43,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesAppSearchTablesFromDirectorySearch()
         {
             var folder = TestData.Get(@"TestData");
@@ -71,13 +71,13 @@ namespace WixToolsetTest.CoreIntegration
                 var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "DrLocator" });
                 Assert.Equal(new[]
                 {
-                    "AppSearch:SAMPLECOMPFOUND\tSampleCompSearch",
+                    "AppSearch:SAMPLEDIRFOUND\tSampleDirSearch",
                     "DrLocator:SampleDirSearch\t\tC:\\SampleDir\t",
                 }, results);
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesAppSearchTablesFromFileSearch()
         {
             var folder = TestData.Get(@"TestData");
@@ -112,7 +112,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesAppSearchTablesFromRegistrySearch()
         {
             var folder = TestData.Get(@"TestData");