From 232176210981a8e21793f6096dd651eba29caf8e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 26 Dec 2018 12:40:58 -0800
Subject: Populate MsiAssemblyName table

Fixes wixtoolset/issues#5865
---
 .../WixToolsetTest.CoreIntegration/MsiFixture.cs   | 24 +++++++++++++++++++---
 .../WixToolsetTest.CoreIntegration.csproj          |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'src/test/WixToolsetTest.CoreIntegration')

diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index 0efe5635..76f57676 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -409,7 +409,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Assembly information not getting gathered yet.")]
+        [Fact]
         public void CanBuildWithAssembly()
         {
             var folder = TestData.Get(@"TestData\Assembly");
@@ -436,7 +436,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
                 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe")));
 
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"test.wir"));
+                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
                 var section = intermediate.Sections.Single();
 
                 var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
@@ -444,7 +444,25 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(@"candle.exe", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
 
                 var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>();
-                Assert.NotEmpty(msiAssemblyNameTuples);
+                Assert.Equal(new[]
+                {
+                    "culture",
+                    "fileVersion",
+                    "name",
+                    "processorArchitecture",
+                    "publicKeyToken",
+                    "version"
+                }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
+
+                Assert.Equal(new[]
+                {
+                    "neutral",
+                    "3.11.11810.0",
+                    "candle",
+                    "x86",
+                    "256B3414DFA97718",
+                    "3.0.0.0"
+                }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Value).ToArray());
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 9cea0f4c..2a20fcff 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
-- 
cgit v1.2.3-55-g6feb