Misc Test Fixes

Author: ChrisMaddock

src/NUnitEngine/nunit.engine.core/Drivers/NUnitNetCore31Driver.cs

@@ -28,9 +28,7 @@
 using System.IO;
 using NUnit.Engine.Internal;
 using System.Reflection;
-using System.Runtime.Loader;
 using NUnit.Engine.Extensibility;
-using Mono.Cecil;
 
 namespace NUnit.Engine.Drivers
 {
@@ -55,7 +53,7 @@ public class NUnitNetCore31Driver : IFrameworkDriver
         static readonly string RUN_ASYNC_METHOD = "RunTests";
         static readonly string STOP_RUN_METHOD = "StopRun";
 
-        static ILogger log = InternalTrace.GetLogger(nameof(NUnitNetStandardDriver));
+        static ILogger log = InternalTrace.GetLogger(nameof(NUnitNetCore31Driver));
 
         Assembly _testAssembly;
         Assembly _frameworkAssembly;

src/NUnitEngine/nunit.engine.core/Drivers/NUnitNetStandardDriver.cs

@@ -21,7 +21,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ***********************************************************************
 
-#if NETSTANDARD || NETCOREAPP3_1
+#if NETSTANDARD
 using System;
 using System.Linq;
 using System.Collections.Generic;

src/NUnitEngine/nunit.engine.tests/Drivers/NUnitNetStandardDriverTests.cs

@@ -21,7 +21,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ***********************************************************************
 
-#if NETCOREAPP
+#if NETCOREAPP1_1 || NETCOREAPP2_1
 
 using System;
 using System.Collections.Generic;

src/NUnitEngine/nunit.engine.tests/Services/DriverServiceTests.cs

@@ -54,7 +54,11 @@ public void ServiceIsStarted()
         }
 
 
-#if NETCOREAPP
+#if NETCOREAPP3_1
+        [TestCase("mock-assembly.dll", false, typeof(NUnitNetCore31Driver))]
+        [TestCase("mock-assembly.dll", true, typeof(NUnitNetCore31Driver))]
+        [TestCase("notest-assembly.dll", false, typeof(NUnitNetCore31Driver))]
+#elif NETCOREAPP1_1 || NETCOREAPP2_1
         [TestCase("mock-assembly.dll", false, typeof(NUnitNetStandardDriver))]
         [TestCase("mock-assembly.dll", true, typeof(NUnitNetStandardDriver))]
         [TestCase("notest-assembly.dll", false, typeof(NUnitNetStandardDriver))]

src/NUnitEngine/nunit.engine.tests/Services/TestFilteringTests.cs

@@ -35,8 +35,10 @@ public class TestFilteringTests
     {
         private const string MOCK_ASSEMBLY = "mock-assembly.dll";
 
-#if NETCOREAPP
+#if NETCOREAPP1_1 || NETCOREAPP2_1
         private NUnitNetStandardDriver _driver;
+#elif NETCOREAPP3_1
+        private NUnitNetCore31Driver _driver;
 #else
         private NUnit3FrameworkDriver _driver;
 #endif
@@ -45,8 +47,10 @@ public class TestFilteringTests
         public void LoadAssembly()
         {
             var mockAssemblyPath = System.IO.Path.Combine(TestContext.CurrentContext.TestDirectory, MOCK_ASSEMBLY);
-#if NETCOREAPP
+#if NETCOREAPP1_1 || NETCOREAPP2_1
             _driver = new NUnitNetStandardDriver();
+#elif NETCOREAPP3_1
+            _driver = new NUnitNetCore31Driver();
 #else
             var assemblyName = typeof(NUnit.Framework.TestAttribute).Assembly.GetName();
             _driver = new NUnit3FrameworkDriver(AppDomain.CurrentDomain, assemblyName);