1 files changed, 21 insertions, 3 deletions

diff --git a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
index 8fc7e14f..f4870ae3 100644
--- a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
@@ -1,9 +1,9 @@
-// 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.
+// 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.
 
 namespace WixToolset.Core.TestPackage
 {
     using System;
-    using System.Linq;
+    using System.Collections.Generic;
     using WixToolset.Data;
     using Xunit;
 
@@ -15,8 +15,26 @@ namespace WixToolset.Core.TestPackage
 
         public WixRunnerResult AssertSuccess()
         {
-            Assert.True(0 == this.ExitCode, $"\r\n\r\nWixRunner failed with exit code: {this.ExitCode}\r\n   Output: {String.Join("\r\n           ", this.Messages.Select(m => m.ToString()).ToArray())}\r\n");
+            Assert.True(0 == this.ExitCode, $"\r\n\r\nWixRunner failed with exit code: {this.ExitCode}\r\n   Output: {String.Join("\r\n           ", FormatMessages(this.Messages))}\r\n");
             return this;
         }
+
+        private static IEnumerable<string> FormatMessages(IEnumerable<Message> messages)
+        {
+            foreach (var message in messages)
+            {
+                var filename = message.SourceLineNumbers?.FileName ?? "TEST";
+                var line = message.SourceLineNumbers?.LineNumber ?? -1;
+                var type = message.Level.ToString().ToLowerInvariant();
+                var output = message.Level >= MessageLevel.Warning ? Console.Out : Console.Error;
+
+                if (line > 0)
+                {
+                    filename = String.Concat(filename, "(", line, ")");
+                }
+
+                yield return String.Format("{0} : {1} {2}{3:0000}: {4}", filename, type, "TEST", message.Id, message.ToString());
+            }
+        }
     }
 }