3 files changed, 27 insertions, 22 deletions

diff --git a/src/WixToolset.Core.TestPackage/TestMessageListener.cs b/src/WixToolset.Core.TestPackage/TestMessageListener.cs
new file mode 100644
index 00000000..246cddd8
--- /dev/null
+++ b/src/WixToolset.Core.TestPackage/TestMessageListener.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using WixToolset.Data;
+using WixToolset.Extensibility;
+
+namespace WixToolset.Core.TestPackage
+{
+    public sealed class TestMessageListener : IMessageListener
+    {
+        public List<Message> Messages { get; } = new List<Message>();
+
+        public string ShortAppName => "TEST";
+
+        public string LongAppName => "Test";
+
+        public void Write(Message message)
+        {
+            this.Messages.Add(message);
+        }
+
+        public void Write(string message)
+        {
+            this.Messages.Add(new Message(null, MessageLevel.Information, 0, message));
+        }
+    }
+}
diff --git a/src/WixToolset.Core.TestPackage/WixRunner.cs b/src/WixToolset.Core.TestPackage/WixRunner.cs
index 1c77a7ee..ff5c3c41 100644
--- a/src/WixToolset.Core.TestPackage/WixRunner.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunner.cs
@@ -5,7 +5,6 @@ namespace WixToolset.Core.TestPackage
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
@@ -19,7 +18,7 @@ namespace WixToolset.Core.TestPackage
 
         public static int Execute(string[] args, IServiceProvider serviceProvider, out List<Message> messages)
         {
-            var listener = new TestListener();
+            var listener = new TestMessageListener();
 
             messages = listener.Messages;
 
@@ -52,24 +51,5 @@ namespace WixToolset.Core.TestPackage
 
             return extensionManager;
         }
-
-        private class TestListener : IMessageListener
-        {
-            public List<Message> Messages { get; } = new List<Message>();
-
-            public string ShortAppName => "TEST";
-
-            public string LongAppName => "Test";
-
-            public void Write(Message message)
-            {
-                this.Messages.Add(message);
-            }
-
-            public void Write(string message)
-            {
-                this.Messages.Add(new Message(null, MessageLevel.Information, 0, message));
-            }
-        }
     }
 }
diff --git a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
index 6cdd8762..3632b064 100644
--- a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+++ b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Internal WiX Toolset Test Package</Description>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>