From f01d284101e95d490497062c2dc9065423d0cf37 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 25 Oct 2019 02:47:47 -0700
Subject: Fix MsiAssembly table processing

---
 .../Bind/AssemblyName.cs                                |  4 ++--
 .../Bind/CreateOutputFromIRCommand.cs                   | 17 +++++++++++++++++
 .../WixToolsetTest.CoreIntegration/MsiQueryFixture.cs   |  2 +-
 .../TestData/Assembly/Win32Assembly.wxs                 |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs
index 0df1a7e9..759ba303 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.Architecture = architecture;
 
             this.StrongNamedSigned = !String.IsNullOrEmpty(publicKeyToken);
-            this.PublicKeyToken = publicKeyToken ?? "null";
+            this.PublicKeyToken = publicKeyToken;
             this.Type = type;
         }
 
@@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             assemblyName.Append(", Culture=");
             assemblyName.Append(this.Culture);
             assemblyName.Append(", PublicKeyToken=");
-            assemblyName.Append(this.PublicKeyToken);
+            assemblyName.Append(this.PublicKeyToken ?? "null");
 
             if (!String.IsNullOrEmpty(this.Architecture))
             {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 17cac83a..081644cb 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -60,6 +60,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     output.EnsureTable(this.TableDefinitions["Signature"]);
                     break;
 
+                case TupleDefinitionType.Assembly:
+                    this.AddAssemblyTuple((AssemblyTuple)tuple, output);
+                    break;
+
                 case TupleDefinitionType.Binary:
                     this.AddTupleDefaultly(tuple, output, idIsPrimaryKey: true);
                     break;
@@ -239,6 +243,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
         }
 
+        private void AddAssemblyTuple(AssemblyTuple tuple, Output output)
+        {
+            var attributes = tuple.Type == AssemblyType.Win32Assembly ? 1 : (int?)null;
+
+            var table = output.EnsureTable(this.TableDefinitions["MsiAssembly"]);
+            var row = table.CreateRow(tuple.SourceLineNumbers);
+            row[0] = tuple.ComponentRef;
+            row[1] = tuple.FeatureRef;
+            row[2] = tuple.ManifestFileRef;
+            row[3] = tuple.ApplicationFileRef;
+            row[4] = attributes;
+        }
+
         private void AddBBControlTuple(BBControlTuple tuple, Output output)
         {
             var attributes = tuple.Attributes;
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 6ebdb993..1b302065 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -480,7 +480,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesMsiAssemblyTables()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
index 980c5ca4..45cc7114 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs
@@ -3,7 +3,7 @@
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <Component Directory="INSTALLFOLDER">
-                <File Source="test.txt" Assembly="win32" AssemblyManifest="test.dll.manifest" />
+                <File Id="test.txt" Source="test.txt" Assembly="win32" AssemblyManifest="test.dll.manifest" />
             </Component>
             <Component Id="test.dll.manifest" Directory="INSTALLFOLDER">
                 <File Id="test.dll.manifest" Source="test.manifest" Name="test.dll.manifest"></File>
-- 
cgit v1.2.3-55-g6feb