From b5f4dc18f3bb740979eda3399e85bda57d2fc719 Mon Sep 17 00:00:00 2001
From: Chris Maddock <chrismaddock@live.co.uk>
Date: Sun, 7 Jun 2020 16:41:49 +0100
Subject: [PATCH] Fix Rebase

---
 build.cake                                                    | 4 ++++
 .../TestRunnerFactoryTests/TestCases/NetStandardTestCases.cs  | 2 +-
 src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.cake b/build.cake
index 1a1dfb9cf..418502854 100644
--- a/build.cake
+++ b/build.cake
@@ -691,6 +691,10 @@ void CheckForError(ref List<string> errorDetail)
 FilePath GetResultXmlPath(string testAssembly, string framework)
 {
     var assemblyName = System.IO.Path.GetFileNameWithoutExtension(testAssembly);
+
+    // Required for Test suites running under NUnitLite
+    CreateDirectory($@"test-results\{framework}");
+
     return MakeAbsolute(new FilePath($@"test-results\{framework}\{assemblyName}.xml"));
 }
 
diff --git a/src/NUnitEngine/nunit.engine.tests/Services/TestRunnerFactoryTests/TestCases/NetStandardTestCases.cs b/src/NUnitEngine/nunit.engine.tests/Services/TestRunnerFactoryTests/TestCases/NetStandardTestCases.cs
index 2bc0be68a..07227a5ff 100644
--- a/src/NUnitEngine/nunit.engine.tests/Services/TestRunnerFactoryTests/TestCases/NetStandardTestCases.cs
+++ b/src/NUnitEngine/nunit.engine.tests/Services/TestRunnerFactoryTests/TestCases/NetStandardTestCases.cs
@@ -68,7 +68,7 @@ public static IEnumerable<TestCaseData> TestCases
                         }
                     });
 
-#if !NETCOREAPP1_6
+#if !NETCOREAPP1_1
                 yield return new TestRunnerFactoryData(
                     "SingleProject (list ctor)",
                     new TestPackage(new[] { "a.nunit" }),
diff --git a/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs b/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs
index 87a7763ca..6a966fafc 100644
--- a/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs
+++ b/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs
@@ -56,7 +56,7 @@ public class MasterTestRunner : ITestRunner
         private ITestEngineRunner _engineRunner;
         private readonly IServiceLocator _services;
 #if !NETSTANDARD1_6
-        private readonly ExtensionService _extensionService;
+        private readonly IExtensionService _extensionService;
 #endif
 #if NETFRAMEWORK
         private readonly IRuntimeFrameworkService _runtimeService;