From d3b12de2f22eb552e073f0c949833a7ef4d4f13c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 7 Oct 2019 13:21:29 -0700
Subject: Fix AppSearch related building

---
 src/WixToolset.Core/Compiler.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/WixToolset.Core/Compiler.cs')

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,
-- 
cgit v1.2.3-55-g6feb