From 2fc5d7b5d24ad2174a2b429e9807158a04b6a478 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 1 Mar 2021 12:37:30 -0800
Subject: Integrate tools with SuppressModularization fix

Resolves wixtoolset/issues#5944
---
 src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs | 6 +++---
 src/wixlib/ComPlusExtension.wxs                            | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs b/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
index 8993205a..ace4d6b6 100644
--- a/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
+++ b/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
@@ -10,16 +10,16 @@ namespace WixToolsetTest.ComPlus
 
     public class ComPlusExtensionFixture
     {
-        [Fact(Skip = "Currently fails due to duplicate symbols")]
+        [Fact]
         public void CanBuildUsingComPlusPartition()
         {
             var folder = TestData.Get(@"TestData\UsingComPlusPartition");
             var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "ComPlusPartition");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
-                "ComPlusPartition:",
+                "ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition",
             }, results);
         }
 
diff --git a/src/wixlib/ComPlusExtension.wxs b/src/wixlib/ComPlusExtension.wxs
index d41e327e..fe74eeae 100644
--- a/src/wixlib/ComPlusExtension.wxs
+++ b/src/wixlib/ComPlusExtension.wxs
@@ -1,6 +1,5 @@
 <!-- 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. -->
 
-
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include caerr.wxi ?>
 
-- 
cgit v1.2.3-55-g6feb