Try to get more helpful test failure messages.

30 files changed, 145 insertions, 90 deletions

diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs b/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs
index 8705ed13..39a92024 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs
@@ -5,6 +5,7 @@ namespace WixToolsetTest.Mba.Core
     using System;
     using System.Collections.Generic;
     using System.Runtime.InteropServices;
+    using WixBuildTools.TestSupport;
     using WixToolset.Mba.Core;
     using Xunit;
 
@@ -45,7 +46,7 @@ namespace WixToolsetTest.Mba.Core
                         Assert.Equal(baFactory.BA.Command.Display, command.display);
 
                         var mbaCommand = baFactory.BA.Command.ParseCommandLine();
-                        Assert.Equal(mbaCommand.UnknownCommandLineArgs, new string[] { "this", "is a", "test" });
+                        WixAssert.CompareLineByLine(mbaCommand.UnknownCommandLineArgs, new string[] { "this", "is a", "test" });
                         Assert.Equal(mbaCommand.Variables, new KeyValuePair<string, string>[]
                         {
                             new KeyValuePair<string, string>("VariableA", "AVariable"),
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index af3a09b0..39d4def3 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -15,6 +15,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
+    <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
diff --git a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
index 8a65c2d4..cd485fd2 100644
--- a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
+++ b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
@@ -5,6 +5,7 @@ namespace WixToolsetTest.Data
     using System;
     using System.IO;
     using System.Linq;
+    using WixBuildTools.TestSupport;
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Data.Symbols;
@@ -375,7 +376,7 @@ namespace WixToolsetTest.Data
                 var loc = loaded.Localizations.Single();
                 Assert.Equal(65001, loc.Codepage);
                 Assert.Empty(loc.Culture);
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "TestVar1/TestValue1/False",
                     "TestVar2/TestValue2/True",
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
index f6e10488..36220fb7 100644
--- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
@@ -13,6 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
+    <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
index edb4f889..d8f1c9ea 100644
--- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
+++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.DifxApp
             var build = new Builder(folder, typeof(DifxAppExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "CustomAction");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:MsiCleanupOnSuccess\t1\tDIFxApp.dll\tCleanupOnSuccess\t",
                 "CustomAction:MsiInstallDrivers\t3073\tDIFxAppA.dll\tInstallDriverPackages\t",
diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs
index 81a5fb00..ae8bbbf0 100644
--- a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs
+++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.DirectX
             var build = new Builder(folder, typeof(DirectXExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "CustomAction");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:WixQueryDirectXCaps\t65\tDirectXCA\tWixQueryDirectXCaps\t",
             }, results);
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
index 5804675c..f7df46e6 100644
--- a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Firewall
             var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "Wix4FirewallException", "CustomAction");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:Wix4ExecFirewallExceptionsInstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t",
                 "CustomAction:Wix4ExecFirewallExceptionsUninstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t",
@@ -36,7 +36,7 @@ namespace WixToolsetTest.Firewall
             var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(BuildARM64, "Wix4FirewallException", "CustomAction");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:Wix4ExecFirewallExceptionsInstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t",
                 "CustomAction:Wix4ExecFirewallExceptionsUninstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t",
diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
index 26c95050..541426a8 100644
--- a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
+++ b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Iis
             var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "Wix4IIsWebSite", "Wix4IIsWebAddress");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Wix4IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0",
                 "Wix4IIsWebSite:Test\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tTest web server\t\tTestWebSiteProductDirectory\t2\t2\tTestAddress\tReadAndExecute\t\t\t\t",
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
index 057b0a9d..a0fac3ca 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Msmq
             var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "MessageQueue");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0",
             }, results);
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 72d4a682..4b8b826e 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -68,7 +68,7 @@ namespace WixToolsetTest.Netfx
             var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Binary:Wix4NetFxCA_X86\t[Binary data]",
                 "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t",
@@ -87,7 +87,7 @@ namespace WixToolsetTest.Netfx
             var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Binary:Wix4NetFxCA_X64\t[Binary data]",
                 "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t",
@@ -106,7 +106,7 @@ namespace WixToolsetTest.Netfx
             var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Binary:Wix4NetFxCA_A64\t[Binary data]",
                 "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t",
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index 54c4c788..ca36fed5 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -18,7 +18,7 @@ namespace WixToolsetTest.UI
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
             var results = build.BuildAndQuery(Build, "Property");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Property:WixUI_Mode\tAdvanced",
             }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray());
@@ -32,7 +32,7 @@ namespace WixToolsetTest.UI
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
             var results = build.BuildAndQuery(Build, "Property");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Property:WixUI_Mode\tFeatureTree",
             }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray());
@@ -46,7 +46,7 @@ namespace WixToolsetTest.UI
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
             var results = build.BuildAndQuery(Build, "Property");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Property:WixUI_Mode\tInstallDir",
             }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray());
@@ -60,7 +60,7 @@ namespace WixToolsetTest.UI
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
             var results = build.BuildAndQuery(Build, "Property");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Property:WixUI_Mode\tMinimal",
             }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray());
@@ -74,7 +74,7 @@ namespace WixToolsetTest.UI
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
             var results = build.BuildAndQuery(Build, "Property");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Property:WixUI_Mode\tMondo",
             }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray());
@@ -88,7 +88,7 @@ namespace WixToolsetTest.UI
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
             var results = build.BuildAndQuery(BuildInGerman, "Control");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "&Ja",
             }, results.Where(s => s.StartsWith("Control:ErrorDlg\tY")).Select(s => s.Split('\t')[9]).ToArray());
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
index 1a574261..dc76e8fb 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
@@ -16,7 +16,7 @@ namespace WixToolsetTest.VisualStudio
             var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder });
 
             var results = build.BuildAndQuery(Build, "CustomAction");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t",
                 "CustomAction:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t",
diff --git a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
index 34af4f34..62ace4a9 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
+++ b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
@@ -29,8 +29,7 @@ namespace TestSupport {
 
         static void NotStringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase)
         {
-            IEqualityComparer<String^>^ comparer = ignoreCase ? StringComparer::InvariantCultureIgnoreCase : StringComparer::InvariantCulture;
-            Assert::NotEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), comparer);
+            WixAssert::NotStringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase);
         }
 
         // For some reason, naming these StringEqual methods "Equal" breaks Intellisense in files that call any overload of the Equal method.
@@ -41,8 +40,7 @@ namespace TestSupport {
 
         static void StringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase)
         {
-            IEqualityComparer<String^>^ comparer = ignoreCase ? StringComparer::InvariantCultureIgnoreCase : StringComparer::InvariantCulture;
-            Assert::Equal(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), comparer);
+            WixAssert::StringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase);
         }
 
         static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs)
diff --git a/src/internal/WixBuildTools.TestSupport/WixAssert.cs b/src/internal/WixBuildTools.TestSupport/WixAssert.cs
index 5638a787..938902ec 100644
--- a/src/internal/WixBuildTools.TestSupport/WixAssert.cs
+++ b/src/internal/WixBuildTools.TestSupport/WixAssert.cs
@@ -3,6 +3,7 @@
 namespace WixBuildTools.TestSupport
 {
     using System;
+    using System.Collections.Generic;
     using System.Linq;
     using System.Xml.Linq;
     using Xunit;
@@ -14,10 +15,10 @@ namespace WixBuildTools.TestSupport
             for (var i = 0; i < expectedLines.Length; ++i)
             {
                 Assert.True(actualLines.Length > i, $"{i}: expectedLines longer than actualLines");
-                Assert.Equal($"{i}: {expectedLines[i]}", $"{i}: {actualLines[i]}");
+                WixAssert.StringEqual($"{i}: {expectedLines[i]}", $"{i}: {actualLines[i]}");
             }
 
-            Assert.True(expectedLines.Length == actualLines.Length, "actualLines longer than expectedLines");
+            Assert.True(expectedLines.Length == actualLines.Length, $"actualLines ({actualLines.Length}) longer than expectedLines ({expectedLines.Length})");
         }
 
         public static void CompareXml(XContainer xExpected, XContainer xActual)
@@ -43,5 +44,48 @@ namespace WixBuildTools.TestSupport
                 throw new SucceededException(hr, String.Format(format, formatArgs));
             }
         }
+
+        public static void StringCollectionEmpty(IList<string> collection)
+        {
+            if (collection.Count > 0)
+            {
+                Assert.True(false, $"The collection was expected to be empty, but instead was [{Environment.NewLine}\"{String.Join($"\", {Environment.NewLine}\"", collection)}\"{Environment.NewLine}]");
+            }
+        }
+
+        public static void StringEqual(string expected, string actual, bool ignoreCase = false)
+        {
+            var comparer = ignoreCase ? StringObjectEqualityComparer.InvariantCultureIgnoreCase : StringObjectEqualityComparer.InvariantCulture;
+            Assert.Equal<object>(expected, actual, comparer);
+        }
+
+        public static void NotStringEqual(string expected, string actual, bool ignoreCase = false)
+        {
+            var comparer = ignoreCase ? StringObjectEqualityComparer.InvariantCultureIgnoreCase : StringObjectEqualityComparer.InvariantCulture;
+            Assert.NotEqual<object>(expected, actual, comparer);
+        }
+
+        private class StringObjectEqualityComparer : IEqualityComparer<object>
+        {
+            public static readonly StringObjectEqualityComparer InvariantCultureIgnoreCase = new StringObjectEqualityComparer(true);
+            public static readonly StringObjectEqualityComparer InvariantCulture = new StringObjectEqualityComparer(false);
+
+            private readonly StringComparer _stringComparer;
+
+            public StringObjectEqualityComparer(bool ignoreCase)
+            {
+                this._stringComparer = ignoreCase ? StringComparer.InvariantCultureIgnoreCase : StringComparer.InvariantCulture;
+            }
+
+            public new bool Equals(object x, object y)
+            {
+                return this._stringComparer.Equals((string)x,(string)y);
+            }
+
+            public int GetHashCode(object obj)
+            {
+                return this._stringComparer.GetHashCode((string)obj);
+            }
+        }
     }
 }
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index 984df169..54f90870 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -7,6 +7,7 @@ namespace WixTestTools
     using System.Linq;
     using System.Text;
     using Microsoft.Win32;
+    using WixBuildTools.TestSupport;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using Xunit;
@@ -93,7 +94,7 @@ namespace WixTestTools
             Assert.True(File.Exists(registration.CachePath));
 
             var expectedCachePath = this.GetExpectedCachedBundlePath();
-            Assert.Equal(expectedCachePath, registration.CachePath, StringComparer.OrdinalIgnoreCase);
+            WixAssert.StringEqual(expectedCachePath, registration.CachePath, true);
 
             return registration.CachePath;
         }
diff --git a/src/test/burn/WixTestTools/TestTool.cs b/src/test/burn/WixTestTools/TestTool.cs
index be5fde42..9c3a3ea6 100644
--- a/src/test/burn/WixTestTools/TestTool.cs
+++ b/src/test/burn/WixTestTools/TestTool.cs
@@ -123,7 +123,7 @@ namespace WixTestTools
                     this.PrintErrors();
                 }
 
-                Assert.Empty(this.Errors);
+                WixAssert.StringCollectionEmpty(this.Errors);
             }
 
             return result;
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs
index ad62dea6..eae6a03a 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs
@@ -42,7 +42,7 @@ namespace WixToolsetTest.CoreIntegration
                 var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList();
 
                 Assert.Equal(new[] { 1, 2 }, fileRows.Select(f => f.Sequence).ToArray());
-                Assert.Equal(new[] { "Notepad.exe", "test.txt" }, fileRows.Select(f => f.Name).ToArray());
+                WixAssert.CompareLineByLine(new[] { "Notepad.exe", "test.txt" }, fileRows.Select(f => f.Name).ToArray());
 
                 var files = Query.GetCabinetFiles(cabPath);
                 Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray());
@@ -78,7 +78,7 @@ namespace WixToolsetTest.CoreIntegration
                 var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList();
 
                 Assert.Equal(new[] { 1 }, fileRows.Select(f => f.Sequence).ToArray());
-                Assert.Equal(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray());
+                WixAssert.CompareLineByLine(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray());
 
                 var files = Query.GetCabinetFiles(cabPath);
                 Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray());
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
index 636b86a6..7a915eb8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
@@ -100,7 +100,7 @@ namespace WixToolsetTest.CoreIntegration
                     "InstallUISequence",
                     "Property",
                 }).Where(x => !x.StartsWith("Property:") || x.StartsWith("Property:MsiHiddenProperties\t")).ToArray();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "ActionText:CustomAction2\tProgess2Text\t",
                     "AdminExecuteSequence:CostFinalize\t\t1000",
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
index ee93b03a..b9a6185d 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
@@ -36,7 +36,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] { "CustomTable1" });
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "CustomTable1:Row1\ttest.txt",
                     "CustomTable1:Row2\ttest.txt",
@@ -71,7 +71,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] { "CustomTableLocalized" });
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "CustomTableLocalized:Row1\tThis is row one",
                     "CustomTableLocalized:Row2\tThis is row two",
@@ -105,7 +105,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] { "CustomTableWithFile" });
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "CustomTableWithFile:Row1\t[Binary data]",
                     "CustomTableWithFile:Row2\t[Binary data]",
@@ -151,7 +151,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] { "CustomTableWithFile" });
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "CustomTableWithFile:Row1\t[Binary data]",
                     "CustomTableWithFile:Row2\t[Binary data]",
@@ -185,7 +185,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] { "CustomTable2" });
-                Assert.Empty(results);
+                WixAssert.StringCollectionEmpty(results);
             }
         }
 
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
index 4195a2a6..1f1a121e 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
@@ -165,7 +165,7 @@ namespace WixToolsetTest.CoreIntegration
             var build = new Builder(folder, null, new[] { folder });
 
             var results = build.BuildAndQuery(Build, "Wix4DependencyProvider");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Wix4DependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
             }, results);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
index a61bdff3..d3fc5a86 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs
@@ -40,7 +40,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage",
                     "ProgramFiles6432Folder:ProgramFilesFolder:.",
@@ -78,7 +78,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage",
                     "ProgramFiles6432Folder:ProgramFiles64Folder:.",
@@ -163,7 +163,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "dZsSsu81KcG46xXTwc4mTSZO5Zx4:INSTALLFOLDER:dupe",
                     "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage",
@@ -202,7 +202,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "BinFolder:ProgramFilesFolder:Example Corporation\\Test Product\\bin",
                     "ProgramFilesFolder:TARGETDIR:PFiles",
@@ -211,7 +211,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var directoryRows = data.Tables["Directory"].Rows;
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "d4EceYatXTyy8HXPt5B6DT9Rj.wE:ProgramFilesFolder:u7-b4gch|Example Corporation",
                     "dSJ1pgiASlW7kJTu0wqsGBklJsS0:d4EceYatXTyy8HXPt5B6DT9Rj.wE:vjj-gxay|Test Product",
@@ -250,7 +250,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "BinFolder\tProgramFilesFolder\tbin",
                     "ProgramFilesFolder\tTARGETDIR\tPFiles",
@@ -259,7 +259,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var data = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var directoryRows = data.Tables["Directory"].Rows;
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "BinFolder\tProgramFilesFolder\tbin",
                     "ProgramFilesFolder\tTARGETDIR\tPFiles",
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index 089658e6..225355bf 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -21,7 +21,7 @@ namespace WixToolsetTest.CoreIntegration
             var build = new Builder(folder, typeof(ExampleExtensionFactory), new[] { Path.Combine(folder, "data") });
 
             var results = build.BuildAndQuery(Build, "Wix4Example");
-            Assert.Equal(new[]
+            WixAssert.CompareLineByLine(new[]
             {
                 "Wix4Example:Foo\tBar"
             }, results);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MediaFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MediaFixture.cs
index de18e30c..6cb94de2 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/MediaFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/MediaFixture.cs
@@ -42,7 +42,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(2, mediaSymbols[0].LastSequence);
                 Assert.Equal(2, mediaSymbols[1].DiskId);
                 Assert.Equal(4, mediaSymbols[1].LastSequence);
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "a1.txt",
                     "a2.txt",
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
index 17e91692..1c5e68f0 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
@@ -59,7 +59,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var fileRows = data.Tables["File"].Rows;
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
                     "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
@@ -68,7 +68,7 @@ namespace WixToolsetTest.CoreIntegration
                 var cabPath = Path.Combine(intermediateFolder, "msm-test.cab");
                 Query.ExtractStream(msmPath, "MergeModule.CABinet", cabPath);
                 var files = Query.GetCabinetFiles(cabPath);
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
                     "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index ff241b50..67a5f132 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -206,7 +206,7 @@ namespace WixToolsetTest.CoreIntegration
                 var error = messages.Single(m => m.Level == MessageLevel.Error);
                 var errorMessage = error.ToString();
                 var checkedPaths = errorMessage.Substring(errorMessage.IndexOf(':') + 1).Split(new[] { ',' }).Select(s => s.Trim()).ToArray();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "test.txt",
                     Path.Combine(folder, "does-not-exist", "test.txt"),
@@ -397,7 +397,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var builtFiles = Directory.GetFiles(Path.Combine(baseFolder, @"bin"));
 
-                Assert.Equal(new[]{
+                WixAssert.CompareLineByLine(new[]{
                     "test.wixipl"
                 }, builtFiles.Select(Path.GetFileName).ToArray());
             }
@@ -428,7 +428,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var builtFiles = Directory.GetFiles(Path.Combine(baseFolder, @"bin"));
 
-                Assert.Equal(new[]{
+                WixAssert.CompareLineByLine(new[]{
                     "test.wixlib"
                 }, builtFiles.Select(Path.GetFileName).ToArray());
             }
@@ -573,7 +573,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
                 var msiAssemblyNameSymbols = section.Symbols.OfType<MsiAssemblyNameSymbol>();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "culture",
                     "fileVersion",
@@ -583,7 +583,7 @@ namespace WixToolsetTest.CoreIntegration
                     "version"
                 }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
 
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "neutral",
                     "3.11.11810.0",
@@ -630,7 +630,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
                 var msiAssemblyNameSymbols = section.Symbols.OfType<MsiAssemblyNameSymbol>();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "culture",
                     "fileVersion",
@@ -639,7 +639,7 @@ namespace WixToolsetTest.CoreIntegration
                     "version"
                 }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
 
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "neutral",
                     "2.0.5805.0",
@@ -782,13 +782,13 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var progids = section.Symbols.OfType<ProgIdSymbol>().OrderBy(symbol => symbol.ProgId).ToList();
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "Foo.File.hol",
                     "Foo.File.hol.15"
                 }, progids.Select(p => p.ProgId).ToArray());
 
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "Foo.File.hol.15",
                     null
@@ -823,20 +823,20 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal("I1", substorage.Name);
 
                 var data = substorage.Data;
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "_SummaryInformation",
                     "Property",
                     "Upgrade"
                 }, data.Tables.Select(t => t.Name).ToArray());
 
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "INSTANCEPROPERTY\tI1",
                     "ProductName\tMsiPackage (Instance 1)",
                 }, JoinRows(data.Tables["Property"]));
 
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "{047730A5-30FE-4A62-A520-DA9381B8226A}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED",
                     "{047730A5-30FE-4A62-A520-DA9381B8226A}\t\t1.0.0.0\t1033\t1\t0\t0",
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index b0c659a9..39231cd2 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -488,7 +488,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabaseByTable(msiPath, new[] { "Wix4Example" });
-                Assert.Empty(results["Wix4Example"]);
+                WixAssert.StringCollectionEmpty(results["Wix4Example"]);
             }
         }
 
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
index 483e3fd5..8fe790de 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
@@ -43,14 +43,14 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value);
 
                 var names = Query.GetSubStorageNames(patchPath);
-                Assert.Equal(new[] { "#RTM.1", "RTM.1" }, names);
+                WixAssert.CompareLineByLine(new[] { "#RTM.1", "RTM.1" }, names);
 
                 var cab = Path.Combine(tempFolder, "foo.cab");
                 Query.ExtractStream(patchPath, "foo.cab", cab);
                 Assert.True(File.Exists(cab));
 
                 var files = Query.GetCabinetFiles(cab);
-                Assert.Equal(new[] { "a.txt", "b.txt" }, files.Select(f => f.Name).ToArray());
+                WixAssert.CompareLineByLine(new[] { "a.txt", "b.txt" }, files.Select(f => f.Name).ToArray());
             }
         }
 
@@ -75,7 +75,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value);
 
                 var names = Query.GetSubStorageNames(patchPath);
-                Assert.Equal(new[] { "#RTM.1", "RTM.1" }, names);
+                WixAssert.CompareLineByLine(new[] { "#RTM.1", "RTM.1" }, names);
 
                 var cab = Path.Combine(tempFolder, "foo.cab");
                 Query.ExtractStream(patchPath, "foo.cab", cab);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index d7296cfe..00b83de8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -308,8 +308,8 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
                 var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray();
-                Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray());
-                Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray());
+                WixAssert.CompareLineByLine(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray());
+                WixAssert.CompareLineByLine(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray());
             }
         }
     }
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 696c73ee..df1a74da 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -29,8 +29,8 @@ namespace WixToolsetTest.Sdk
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
                 result.AssertSuccess();
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
                     .Select(s => s.Substring(baseFolder.Length + 1))
@@ -62,8 +62,8 @@ namespace WixToolsetTest.Sdk
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
                 result.AssertSuccess();
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
                     .Select(s => s.Substring(baseFolder.Length + 1))
@@ -96,8 +96,8 @@ namespace WixToolsetTest.Sdk
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
                 result.AssertSuccess();
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
                     .Select(s => s.Substring(baseFolder.Length + 1))
@@ -166,8 +166,8 @@ namespace WixToolsetTest.Sdk
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath);
                 result.AssertSuccess();
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
                     .Select(s => s.Substring(baseFolder.Length + 1))
@@ -318,8 +318,8 @@ namespace WixToolsetTest.Sdk
                 });
                 result.AssertSuccess();
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
             }
         }
 
@@ -409,7 +409,7 @@ namespace WixToolsetTest.Sdk
                     .Where(s => !allowedFiles.Contains(s))
                     .OrderBy(s => s)
                     .ToArray();
-                Assert.Empty(remainingPaths);
+                WixAssert.StringCollectionEmpty(remainingPaths);
             }
         }
 
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
index 8b2e8e3d..cb14bc43 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
@@ -36,15 +36,15 @@ namespace WixToolsetTest.Sdk
                 var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
                 Assert.Single(heatCommandLines);
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
                 Assert.True(File.Exists(generatedFilePath));
 
                 var generatedContents = File.ReadAllText(generatedFilePath);
                 var testXml = generatedContents.GetTestXml();
-                Assert.Equal(@"<Wix>" +
+                WixAssert.StringEqual(@"<Wix>" +
                     "<Fragment>" +
                     "<DirectoryRef Id='INSTALLFOLDER'>" +
                     "<Component Id='HeatFilePackage.wixproj' Guid='*'>" +
@@ -92,15 +92,15 @@ namespace WixToolsetTest.Sdk
                 var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
                 Assert.Equal(2, heatCommandLines.Count());
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
                 Assert.True(File.Exists(generatedFilePath));
 
                 var generatedContents = File.ReadAllText(generatedFilePath);
                 var testXml = generatedContents.GetTestXml();
-                Assert.Equal("<Wix>" +
+                WixAssert.StringEqual("<Wix>" +
                     "<Fragment>" +
                     "<DirectoryRef Id='INSTALLFOLDER'>" +
                     "<Component Id='MyProgram.txt' Guid='*'>" +
@@ -120,7 +120,7 @@ namespace WixToolsetTest.Sdk
 
                 generatedContents = File.ReadAllText(generatedFilePath);
                 testXml = generatedContents.GetTestXml();
-                Assert.Equal("<Wix>" +
+                WixAssert.StringEqual("<Wix>" +
                     "<Fragment>" +
                     "<DirectoryRef Id='INSTALLFOLDER'>" +
                     "<Component Id='MyProgram.json' Guid='*'>" +
@@ -184,15 +184,15 @@ namespace WixToolsetTest.Sdk
                     Assert.DoesNotContain("-usetoolsversion", heatCommandLine);
                 }
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ToolsVersion4Cs.wxs");
                 Assert.True(File.Exists(generatedFilePath));
 
                 var generatedContents = File.ReadAllText(generatedFilePath);
                 var testXml = generatedContents.GetTestXml();
-                Assert.Equal(@"<Wix>" +
+                WixAssert.StringEqual(@"<Wix>" +
                     "<Fragment>" +
                         "<DirectoryRef Id='ToolsVersion4Cs.Binaries'>" +
                             "<Component Id='ToolsVersion4Cs.Binaries.ToolsVersion4Cs.dll' Guid='*'>" +
@@ -253,7 +253,7 @@ namespace WixToolsetTest.Sdk
                 var section = intermediate.Sections.Single();
 
                 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
+                WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
             }
         }
 
@@ -301,15 +301,15 @@ namespace WixToolsetTest.Sdk
                     Assert.DoesNotContain("-usetoolsversion", heatCommandLine);
                 }
 
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
+                var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
+                WixAssert.StringCollectionEmpty(warnings);
 
                 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_SdkStyleCs.wxs");
                 Assert.True(File.Exists(generatedFilePath));
 
                 var generatedContents = File.ReadAllText(generatedFilePath);
                 var testXml = generatedContents.GetTestXml();
-                Assert.Equal(@"<Wix>" +
+                WixAssert.StringEqual(@"<Wix>" +
                     "<Fragment>" +
                         "<DirectoryRef Id='SdkStyleCs.Binaries'>" +
                             "<Component Id='SdkStyleCs.Binaries.SdkStyleCs.dll' Guid='*'>" +
@@ -368,7 +368,7 @@ namespace WixToolsetTest.Sdk
                 var section = intermediate.Sections.Single();
 
                 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
+                WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
             }
         }
     }