Fix Rebase

Author: ChrisMaddock

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"));
 }
 

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" }),

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;