From 16ebbac306cebd4c5044ed89086c920e1bf6fae4 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 28 Oct 2019 10:48:32 -0700
Subject: Fix AppId tuple

---
 src/WixToolset.Core/Compiler.cs                            | 5 ++---
 src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 974f3188..ae99b673 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -548,10 +548,9 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var id = new Identifier(AccessModifier.Public, appId);
-
-                    var tuple = new AppIdTuple(sourceLineNumbers, id)
+                    var tuple = new AppIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, appId))
                     {
+                        AppId = appId,
                         RemoteServerName = remoteServerName,
                         LocalService = localService,
                         ServiceParameters = serviceParameters,
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index fa14f06c..7f06eea6 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 PopulatesAppIdTableWhenAdvertised()
         {
             var folder = TestData.Get(@"TestData");
-- 
cgit v1.2.3-55-g6feb