Merge pull request #1609 from nunit/issue-1608

Create new nunit.common assembly
nunit · Jan 23, 2025 · 2768679 · 2768679
2 parents 6f0deee + 9296dd4
commit 2768679
Show file tree

Hide file tree

Showing 79 changed files with 137 additions and 358 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -97,8 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net60", "src\NUnitEngine\agents\nunit-agent-net60\nunit-agent-net60.csproj", "{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net462", "src\NUnitEngine\agents\nunit-agent-net462\nunit-agent-net462.csproj", "{E4041712-A1F1-479D-A7F7-89F491066163}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net462-x86", "src\NUnitEngine\agents\nunit-agent-net462-x86\nunit-agent-net462-x86.csproj", "{D4AE483A-D4E1-4892-AF87-3607FBA8755F}"
@@ -145,6 +143,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.2", "src\TestData\NU
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.10", "src\TestData\NUnit3.10\NUnit3.10.csproj", "{0555B97D-E918-455B-951C-74EFCDA8790A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitEngine\nunit.common\nunit.common.csproj", "{542685E5-8C2E-4425-ADD1-C45B55AFB964}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitEngine\nunit.common.tests\nunit.common.tests.csproj", "{F546CFE1-74B0-45D3-A06A-8972D73F4419}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -183,10 +185,6 @@ Global
 		{CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4041712-A1F1-479D-A7F7-89F491066163}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -255,6 +253,14 @@ Global
 		{0555B97D-E918-455B-951C-74EFCDA8790A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -275,7 +281,6 @@ Global
 		{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
 		{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
-		{D5CC541C-95B7-4CB4-AADD-660FDCC281B8} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
 		{E4041712-A1F1-479D-A7F7-89F491066163} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
 		{D4AE483A-D4E1-4892-AF87-3607FBA8755F} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
 		{E1F5F8D3-4AC4-4BB0-9438-2BF41768B473} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
@@ -297,6 +302,8 @@ Global
 		{56416AD9-8E7B-4F72-B0E1-E75A024431F8} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
 		{8AFBB856-700A-4CCC-AE0E-9B622178E1E0} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
 		{0555B97D-E918-455B-951C-74EFCDA8790A} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
+		{542685E5-8C2E-4425-ADD1-C45B55AFB964} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
+		{F546CFE1-74B0-45D3-A06A-8972D73F4419} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

diff --git a/build.cake b/build.cake
@@ -35,22 +35,22 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         checks: new PackageCheck[] {
             HasFiles("LICENSE.txt", "NOTICES.txt"),
             HasDirectory("tools").WithFiles(
-                "nunit-console.exe", "nunit-console.exe.config",
-                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
+                "nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll",
+                "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("tools/agents/net462").WithFiles(
                 "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
-                "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
+                "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("tools/agents/net8.0").WithFiles(
                 "nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
-                "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
+                "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
         },
         symbols: new PackageCheck[] {
             HasDirectory("tools").WithFiles(
-                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
+                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
             HasDirectory("tools/agents/net462").WithFiles(
-                "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
+                "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
             HasDirectory("tools/agents/net8.0").WithFiles(
-                "nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb")
+                "nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
             + $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
@@ -83,13 +83,13 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         checks: new PackageCheck[] {
             HasDirectory("tools").WithFiles(
                 "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config",
-                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
+                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("tools/agents/net462").WithFiles(
                 "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
-                "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
+                "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("tools/agents/net8.0").WithFiles(
                 "nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
-                "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
+                "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
             + $"nunit-console-runner-v4.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
@@ -101,25 +101,25 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         checks: new PackageCheck[] {
             HasFiles("LICENSE.txt", "NOTICES.txt"),
             HasDirectory("lib/net462").WithFiles(
-                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
+                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("lib/net8.0").WithFiles(
-                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
+                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
             HasDirectory("agents/net462").WithFiles(
                 "nunit-agent-net462.exe", "nunit-agent-net462.exe.config",
                 "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
-                "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
+                "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("agents/net8.0").WithFiles(
                 "nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
                 "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
         symbols: new PackageCheck[] {
             HasDirectory("lib/net462").WithFiles(
                 "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
             HasDirectory("lib/net8.0").WithFiles(
-                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
+                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
             HasDirectory("contentFiles/any/agents/net462").WithFiles(
-                "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
+                "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
             HasDirectory("contentFiles/any/agents/net8.0").WithFiles(
-                "nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb")
+                "nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
         }),
 
     NUnitEngineApiPackage = new NuGetPackage(

diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec
@@ -36,6 +36,7 @@
     <file src = "$BIN_DIR$net462/nunit.engine.api.dll" target="tools" />
     <file src = "$BIN_DIR$net462/nunit.engine.api.xml" target="tools" />
     <file src = "$BIN_DIR$net462/nunit.engine.core.dll" target="tools" />
+    <file src = "$BIN_DIR$net462/nunit.common.dll" target="tools" />
     <file src = "$BIN_DIR$net462/nunit.engine.dll" target="tools" />
     <file src = "$BIN_DIR$net462/testcentric.metadata.dll" target="tools" />
 
@@ -46,6 +47,7 @@
     <file src = "$BIN_DIR$agents/net462/nunit.engine.api.dll" target="tools/agents/net462" />
     <file src = "$BIN_DIR$agents/net462/nunit.engine.api.xml" target="tools/agents/net462" />
     <file src = "$BIN_DIR$agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
+    <file src = "$BIN_DIR$agents/net462/nunit.common.dll" target="tools/agents/net462" />
     <file src = "$BIN_DIR$agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />
     <file src = "nunit-agent.exe.ignore" target="tools/agents/net462" />
     <file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net462" />
@@ -57,6 +59,7 @@
     <file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.xml" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
+    <file src = "$BIN_DIR$agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/testcentric.metadata.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
   </files>

diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
@@ -39,6 +39,8 @@
     <file src="net462/nunit.engine.pdb" target="lib/net462" />
     <file src="net462/nunit.engine.core.dll" target="lib/net462" />
     <file src="net462/nunit.engine.core.pdb" target="lib/net462" />
+    <file src="net462/nunit.common.dll" target="lib/net462" />
+    <file src="net462/nunit.common.pdb" target="lib/net462" />
     <file src="net462/nunit.engine.api.dll" target="lib/net462" />
     <file src="net462/nunit.engine.api.pdb" target="lib/net462" />
     <file src="net462/testcentric.metadata.dll" target="lib/net462" />
@@ -48,6 +50,8 @@
     <file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.core.pdb" target="lib/net8.0" />
+    <file src="net8.0/nunit.common.dll" target="lib/net8.0" />
+    <file src="net8.0/nunit.common.pdb" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.api.dll" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.api.pdb" target="lib/net8.0" />
     <file src="net8.0/testcentric.metadata.dll" target="lib/net8.0" />
@@ -62,6 +66,8 @@
     <file src="agents/net462/nunit-agent-net462-x86.exe.config" target="agents/net462" />
     <file src="agents/net462/nunit.engine.core.dll" target="agents/net462" />
     <file src="agents/net462/nunit.engine.core.pdb" target="agents/net462" />
+    <file src="agents/net462/nunit.common.dll" target="agents/net462" />
+    <file src="agents/net462/nunit.common.pdb" target="agents/net462" />
     <file src="agents/net462/nunit.engine.api.dll" target="agents/net462" />
     <file src="agents/net462/nunit.engine.api.pdb" target="agents/net462" />
     <file src="agents/net462/testcentric.metadata.dll" target="agents/net462" />
@@ -73,6 +79,8 @@
     <file src="agents/net8.0/nunit-agent-net80.runtimeconfig.json" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.engine.core.dll" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.engine.core.pdb" target="agents/net8.0" />
+    <file src="agents/net8.0/nunit.common.dll" target="agents/net8.0" />
+    <file src="agents/net8.0/nunit.common.pdb" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.engine.api.dll" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.engine.api.pdb" target="agents/net8.0" />
     <file src="agents/net8.0/testcentric.metadata.dll" target="agents/net8.0" />

diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec
@@ -37,6 +37,8 @@
     <file src="net8.0/nunit-netcore-console.runtimeconfig.json" target="tools/net8.0/any" />
     <file src="net8.0/nunit.engine.core.dll" target="tools/net8.0/any" />
     <file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.common.dll" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.common.pdb" target="tools/net8.0/any" />
     <file src="net8.0/nunit.engine.dll" target="tools/net8.0/any" />
     <file src="net8.0/nunit.engine.pdb" target="tools/net8.0/any" />
     <file src="net8.0/nunit.engine.api.dll" target="tools/net8.0/any" />

diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec
@@ -38,6 +38,8 @@
     <file src="agents/net462/nunit.engine.api.xml" target="tools/agents/net462" />
     <file src="agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
     <file src="agents/net462/nunit.engine.core.pdb" target="tools/agents/net462" />
+    <file src="agents/net462/nunit.common.dll" target="tools/agents/net462" />
+    <file src="agents/net462/nunit.common.pdb" target="tools/agents/net462" />
     <file src="agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />
 
     <file src="agents/net8.0/nunit-agent-net80.dll" target="tools/agents/net8.0" />
@@ -50,6 +52,8 @@
     <file src="agents/net8.0/nunit.engine.api.xml" target="tools/agents/net8.0" />
     <file src="agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
     <file src="agents/net8.0/nunit.engine.core.pdb" target="tools/agents/net8.0" />
+    <file src="agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />
+    <file src="agents/net8.0/nunit.common.pdb" target="tools/agents/net8.0" />
     <file src="agents/net8.0/testcentric.metadata.dll" target="tools/agents/net8.0" />
     <file src="agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
 
@@ -61,6 +65,8 @@
     <file src="net462/nunit.engine.api.xml" target="tools" />
     <file src="net462/nunit.engine.core.dll" target="tools" />
     <file src="net462/nunit.engine.core.pdb" target="tools" />
+    <file src="net462/nunit.common.dll" target="tools" />
+    <file src="net462/nunit.common.pdb" target="tools" />
     <file src="net462/nunit.engine.dll" target="tools" />
     <file src="net462/nunit.engine.pdb" target="tools" />
     <file src="net462/testcentric.metadata.dll" target="tools" />

diff --git a/src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs b/src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
-using NUnit.Common;
 using NUnit.Framework;
 
 namespace NUnit.ConsoleRunner

diff --git a/src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs b/src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
-using NUnit.Common;
 using NUnit.Framework;
 
 namespace NUnit.ConsoleRunner

diff --git a/src/NUnitConsole/nunit4-console.tests/CommandLineTests.cs b/src/NUnitConsole/nunit4-console.tests/CommandLineTests.cs
@@ -3,7 +3,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using NUnit.Common;
 using System.Collections.Generic;
 using NUnit.Framework;
 using NUnit.ConsoleRunner.Options;

diff --git a/src/NUnitConsole/nunit4-console.tests/ConsoleMocks.cs b/src/NUnitConsole/nunit4-console.tests/ConsoleMocks.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using NSubstitute;
-using NUnit.Common;
 
 namespace NUnit.ConsoleRunner.Options
 {

diff --git a/src/NUnitConsole/nunit4-console.tests/Options/DefaultOptionsProviderTests.cs b/src/NUnitConsole/nunit4-console.tests/Options/DefaultOptionsProviderTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
-using NUnit.Common;
 using NUnit.Framework;
 
 namespace NUnit.ConsoleRunner.Options

diff --git a/src/NUnitConsole/nunit4-console.tests/Program.cs b/src/NUnitConsole/nunit4-console.tests/Program.cs
@@ -8,11 +8,7 @@ class Program
     {
         static int Main(string[] args)
         {
-#if NETFRAMEWORK
             return new NUnitLite.TextRunner(typeof(Program).Assembly).Execute(args);
-#else
-            return new NUnitLite.TextRunner(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-#endif
         }
     }
 }
diff --git a/src/NUnitConsole/nunit4-console.tests/VirtualFileSystem.cs b/src/NUnitConsole/nunit4-console.tests/VirtualFileSystem.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using NUnit.Common;
 using System.IO;
 
 namespace NUnit.ConsoleRunner

diff --git a/src/NUnitConsole/nunit4-console/ColorConsoleWriter.cs b/src/NUnitConsole/nunit4-console/ColorConsoleWriter.cs
@@ -1,9 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
-using System.IO;
-using System.Text;
-using NUnit.Common;
 
 namespace NUnit.ConsoleRunner
 {

diff --git a/src/NUnitConsole/nunit4-console/ConsoleRunner.cs b/src/NUnitConsole/nunit4-console/ConsoleRunner.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
-using NUnit.Common;
 using NUnit.ConsoleRunner.Utilities;
 using NUnit.ConsoleRunner.Options;
 using NUnit.Engine;

diff --git a/src/NUnitConsole/nunit4-console/Options/Options.cs b/src/NUnitConsole/nunit4-console/Options/Options.cs
@@ -171,7 +171,6 @@
 #endif
 using System.Text;
 using System.Text.RegularExpressions;
-using NUnit.Common;
 
 
 #if LINQ

diff --git a/src/NUnitConsole/nunit4-console/Program.cs b/src/NUnitConsole/nunit4-console/Program.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using NUnit.Common;
 using NUnit.Engine;
 
 using NUnit.ConsoleRunner.Options;