Eliminate nunit.engine.core and nunit.engine.core.tests

nunit · Feb 3, 2025 · a036e1c · a036e1c
1 parent c6398d2
commit a036e1c
Show file tree

Hide file tree

Showing 28 changed files with 22 additions and 216 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -88,17 +88,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
 		nuget\deprecated\nunit.runners.nuspec = nuget\deprecated\nunit.runners.nuspec
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core", "src\NUnitEngine\nunit.engine.core\nunit.engine.core.csproj", "{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly-x86", "src\TestData\mock-assembly-x86\mock-assembly-x86.csproj", "{9D3015EE-5B84-41B3-A1D3-1A439370C392}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{068F6CA9-6108-4F45-8540-351AA5227259}"
 	ProjectSection(SolutionItems) = preProject
 		choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core.tests", "src\NUnitEngine\nunit.engine.core.tests\nunit.engine.core.tests.csproj", "{CACC0520-B452-4310-A33C-DC944129ACDD}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37D508B2-91E0-4B32-869B-DFF9E68EA213}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}"
@@ -161,9 +157,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitCo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitCommon\nunit.common.tests\nunit.common.tests.csproj", "{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.agent.core", "src\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj", "{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.agent.core", "src\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj", "{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.agent.core.tests", "src\NUnitCommon\nunit.agent.core.tests\nunit.agent.core.tests.csproj", "{89258A3E-5B62-487A-9AE7-D7672CBF61F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.agent.core.tests", "src\NUnitCommon\nunit.agent.core.tests\nunit.agent.core.tests.csproj", "{89258A3E-5B62-487A-9AE7-D7672CBF61F1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -191,18 +187,10 @@ Global
 		{B1D90742-39BD-429C-8E87-C5CD2991DF27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1D90742-39BD-429C-8E87-C5CD2991DF27}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1D90742-39BD-429C-8E87-C5CD2991DF27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
 		{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
@@ -314,10 +302,8 @@ Global
 		{B1D90742-39BD-429C-8E87-C5CD2991DF27} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
 		{4FDF7BFA-A337-41D3-898D-C6A98278E6AD} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{9A7C8370-ED1F-486F-A8F5-C5BF4221464E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
-		{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{9D3015EE-5B84-41B3-A1D3-1A439370C392} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
 		{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}
 		{E4041712-A1F1-479D-A7F7-89F491066163} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
 		{D4AE483A-D4E1-4892-AF87-3607FBA8755F} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}

diff --git a/build.cake b/build.cake
@@ -34,7 +34,7 @@ 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-console.exe", "nunit-console.exe.config", "nunit.engine.dll",
                 "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll", 
                 "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("tools/agents/net462").WithFiles(
@@ -48,7 +48,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         },
         symbols: new PackageCheck[] {
             HasDirectory("tools").WithFiles(
-                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
+                "nunit.engine.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
                 "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
             HasDirectory("tools/agents/net462").WithFiles(
                 "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.agent.core.pdb", 
@@ -75,7 +75,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
             HasFiles("nunit.exe"),
             HasDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any").WithFiles(
                 "nunit-netcore-console.dll", "nunit-netcore-console.dll.config",
-                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", 
+                "nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", 
                 "nunit.extensibility.api.dll", "nunit.engine.api.dll", "testcentric.metadata.dll",
                 "Microsoft.Extensions.DependencyModel.dll")
         },
@@ -89,7 +89,7 @@ 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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.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",
@@ -110,10 +110,10 @@ 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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
                 "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
             HasDirectory("lib/net8.0").WithFiles(
-                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.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",
@@ -126,10 +126,10 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
                 "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
         symbols: new PackageCheck[] {
             HasDirectory("lib/net462").WithFiles(
-                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb",
+                "nunit.engine.pdb", "nunit.extensibility.pdb",
                 "nunit.extensibility.api.pdb", "nunit.engine.api.pdb"),
             HasDirectory("lib/net8.0").WithFiles(
-                "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
+                "nunit.engine.pdb","nunit.extensibility.pdb", "nunit.extensibility.api.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.extensibility.pdb",

diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec
@@ -35,7 +35,6 @@
     <file src = "$BIN_DIR$net462/nunit-console.exe.config" target="tools" />
     <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.extensibility.dll" target="tools" />
     <file src = "$BIN_DIR$net462/nunit.extensibility.api.dll" target="tools" />
     <file src = "$BIN_DIR$net462/nunit.common.dll" target="tools" />

diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
@@ -37,8 +37,6 @@
 
     <file src="net462/nunit.engine.dll" target="lib/net462" />
     <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.extensibility.dll" target="lib/net462" />
     <file src="net462/nunit.extensibility.pdb" target="lib/net462" />
     <file src="net462/nunit.extensibility.api.dll" target="lib/net462" />
@@ -52,8 +50,6 @@
 
     <file src="net8.0/nunit.engine.dll" target="lib/net8.0" />
     <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.agent.core.dll" target="lib/net8.0" />
     <file src="net8.0/nunit.agent.core.pdb" target="lib/net8.0" />
     <file src="net8.0/nunit.extensibility.dll" target="lib/net8.0" />

diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec
@@ -35,8 +35,6 @@
     <file src="net8.0/nunit-netcore-console.dll.config" target="tools/net8.0/any" />
     <file src="net8.0/nunit-netcore-console.deps.json" target="tools/net8.0/any" />
     <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.agent.core.dll" target="tools/net8.0/any" />
     <file src="net8.0/nunit.agent.core.pdb" target="tools/net8.0/any" />
     <file src="net8.0/nunit.extensibility.dll" target="tools/net8.0/any" />

diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec
@@ -71,8 +71,6 @@
     <file src="net462/nunit.engine.api.dll" target="tools" />
     <file src="net462/nunit.engine.api.pdb" target="tools" />
     <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.extensibility.dll" target="tools" />
     <file src="net462/nunit.extensibility.pdb" target="tools" />
     <file src="net462/nunit.extensibility.api.dll" target="tools" />

diff --git a/...ore.tests/Internal/AssemblyHelperTests.cs → ...nunit.common.tests/AssemblyHelperTests.cs b/...ore.tests/Internal/AssemblyHelperTests.cs → ...nunit.common.tests/AssemblyHelperTests.cs
@@ -9,16 +9,16 @@ namespace NUnit.Engine.Internal
     public class AssemblyHelperTests
     {
 #if NETFRAMEWORK
-        private static readonly string THIS_ASSEMBLY_PATH = "nunit.engine.core.tests.exe";
+        private static readonly string THIS_ASSEMBLY_FILENAME = "nunit.common.tests.exe";
 #else
-        private static readonly string THIS_ASSEMBLY_PATH = "nunit.engine.core.tests.dll";
+        private static readonly string THIS_ASSEMBLY_FILENAME = "nunit.common.tests.dll";
 #endif
 
         [Test]
         public void GetPathForAssembly()
         {
             string path = AssemblyHelper.GetAssemblyPath(this.GetType().Assembly);
-            Assert.That(Path.GetFileName(path), Is.EqualTo(THIS_ASSEMBLY_PATH).IgnoreCase);
+            Assert.That(Path.GetFileName(path), Is.EqualTo(THIS_ASSEMBLY_FILENAME).IgnoreCase);
             Assert.That(File.Exists(path));
         }
 

diff --git a/...re.tests/Internal/DirectoryFinderTests.cs → .../FileSystemAccess/DirectoryFinderTests.cs b/...re.tests/Internal/DirectoryFinderTests.cs → .../FileSystemAccess/DirectoryFinderTests.cs
diff --git a/...ileSystemAccess/Default/DirectoryTests.cs → ....tests/FileSystemAccess/DirectoryTests.cs b/...ileSystemAccess/Default/DirectoryTests.cs → ....tests/FileSystemAccess/DirectoryTests.cs
diff --git a/...leSystemAccess/Default/DirectoryTests2.cs → ...tests/FileSystemAccess/DirectoryTests2.cs b/...leSystemAccess/Default/DirectoryTests2.cs → ...tests/FileSystemAccess/DirectoryTests2.cs
diff --git a/...leSystemAccess/Default/FileSystemTests.cs → ...tests/FileSystemAccess/FileSystemTests.cs b/...leSystemAccess/Default/FileSystemTests.cs → ...tests/FileSystemAccess/FileSystemTests.cs
diff --git a/...sts/FileSystemAccess/Default/FileTests.cs → ...ommon.tests/FileSystemAccess/FileTests.cs b/...sts/FileSystemAccess/Default/FileTests.cs → ...ommon.tests/FileSystemAccess/FileTests.cs
diff --git a/...ine/nunit.engine.core.tests/Helpers/On.cs → src/NUnitCommon/nunit.common.tests/On.cs b/...ine/nunit.engine.core.tests/Helpers/On.cs → src/NUnitCommon/nunit.common.tests/On.cs
diff --git a/...gine.core.tests/Internal/PathUtilTests.cs → ...ommon/nunit.common.tests/PathUtilTests.cs b/...gine.core.tests/Internal/PathUtilTests.cs → ...ommon/nunit.common.tests/PathUtilTests.cs
diff --git a/....core.tests/Internal/ProcessUtilsTests.cs → ...n/nunit.common.tests/ProcessUtilsTests.cs b/....core.tests/Internal/ProcessUtilsTests.cs → ...n/nunit.common.tests/ProcessUtilsTests.cs
diff --git a/...it.engine.core.tests/ResultHelperTests.cs → ...n/nunit.common.tests/ResultHelperTests.cs b/...it.engine.core.tests/ResultHelperTests.cs → ...n/nunit.common.tests/ResultHelperTests.cs
diff --git a/...re.tests/Internal/TcpChannelUtilsTests.cs → ...unit.common.tests/TcpChannelUtilsTests.cs b/...re.tests/Internal/TcpChannelUtilsTests.cs → ...unit.common.tests/TcpChannelUtilsTests.cs
diff --git a/src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj b/src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj
@@ -12,9 +12,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnitLite" Version="4.2.2" />
     <PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="System.Runtime.Remoting" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs b/src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs
@@ -153,11 +153,11 @@ public void SkipsGracefullyLoadingOtherFrameworkExtensionAssembly()
             Assume.That(Assembly.GetEntryAssembly(), Is.Not.Null, "Entry assembly is null, framework loading validation will be skipped.");
 
 #if NETCOREAPP
-            // Attempt to load the .NET 3.5 version of the extensions from the .NET Core 2.0 tests
-            var assemblyName = Path.Combine(GetSiblingDirectory("net462"), "nunit.engine.core.tests.exe");
+            // Attempt to load the .NET 4.6.2 version of the extensions from the .NET 8.0 tests
+            var assemblyName = Path.Combine(GetSiblingDirectory("net462"), "nunit.extensibility.tests.exe");
 #else
-            // Attempt to load the .NET Core 3.1 version of the extensions from the .NET 3.5 tests
-            var assemblyName = Path.Combine(GetSiblingDirectory("netcoreapp3.1"), "nunit.engine.core.tests.dll");
+            // Attempt to load the .NET 8.0 version of the extensions from the .NET 4.6.2 tests
+            var assemblyName = Path.Combine(GetSiblingDirectory("net8.0"), "nunit.extensibility.tests.dll");
 #endif
             Assert.That(assemblyName, Does.Exist);
             Console.WriteLine($"{assemblyName} does exist");

diff --git a/src/NUnitEngine/nunit.engine.core.tests/App.config b/src/NUnitEngine/nunit.engine.core.tests/App.config
diff --git a/src/NUnitEngine/nunit.engine.core.tests/Program.cs b/src/NUnitEngine/nunit.engine.core.tests/Program.cs
diff --git a/src/NUnitEngine/nunit.engine.core.tests/alt.config b/src/NUnitEngine/nunit.engine.core.tests/alt.config
diff --git a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj b/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj
diff --git a/src/NUnitEngine/nunit.engine.core/InternalEnginePackageSettings.cs b/src/NUnitEngine/nunit.engine.core/InternalEnginePackageSettings.cs