Add WixRunnerResult to improve success assertion

3 files changed, 36 insertions, 2 deletions

diff --git a/src/WixToolset.Core.TestPackage/WixRunner.cs b/src/WixToolset.Core.TestPackage/WixRunner.cs
index ff5c3c41..d7487f6d 100644
--- a/src/WixToolset.Core.TestPackage/WixRunner.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunner.cs
@@ -16,6 +16,13 @@ namespace WixToolset.Core.TestPackage
             return Execute(args, serviceProvider, out messages);
         }
 
+        public static WixRunnerResult Execute(string[] args)
+        {
+            var serviceProvider = new WixToolsetServiceProvider();
+            var exitCode = Execute(args, serviceProvider, out var messages);
+            return new WixRunnerResult { ExitCode = exitCode, Messages = messages.ToArray() };
+        }
+
         public static int Execute(string[] args, IServiceProvider serviceProvider, out List<Message> messages)
         {
             var listener = new TestMessageListener();
diff --git a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
new file mode 100644
index 00000000..45e31c2d
--- /dev/null
+++ b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
@@ -0,0 +1,22 @@
+// 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 WixToolset.Data;
+    using Xunit;
+
+    public class WixRunnerResult
+    {
+        public int ExitCode { get; set; }
+
+        public Message[] Messages { get; set; }
+
+        public WixRunnerResult AssertSuccess()
+        {
+            Assert.True(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:\r\n{String.Join("\r\n", this.Messages.Select(m => m.ToString()).ToArray())}");
+            return this;
+        }
+    }
+}
diff --git a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
index 3632b064..f02cade7 100644
--- a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+++ b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
@@ -1,9 +1,9 @@
-<?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">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
     <Description>Internal WiX Toolset Test Package</Description>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -37,4 +37,9 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit" Version="2.4.0" />
+  </ItemGroup>
+
 </Project>