Get Packaging working

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

Hide file tree

Showing 15 changed files with 45 additions and 47 deletions.
diff --git a/build.cake b/build.cake
@@ -39,22 +39,22 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
                 "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.extensibility.dll", "nunit.extensibility.api.dll", 
+                "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.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.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.engine.core.pdb", 
+                "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.agent.core.pdb", 
                 "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
             HasDirectory("tools/agents/net8.0").WithFiles(
-                "nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
+                "nunit-agent.pdb", "nunit.agent.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
                 "nunit.common.pdb", "nunit.engine.api.pdb")
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
@@ -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.extensibility.dll", 
+                "nunit.engine.dll", "nunit.engine.core.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", 
                 "nunit.extensibility.api.dll", "nunit.engine.api.dll", "testcentric.metadata.dll",
                 "Microsoft.Extensions.DependencyModel.dll")
         },
@@ -93,11 +93,11 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
                 "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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
                 "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
@@ -113,16 +113,16 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
                 "nunit.engine.dll", "nunit.engine.core.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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.engine.dll", "nunit.engine.core.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",
                 "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
-                "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.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.extensibility.dll", "nunit.extensibility.api.dll",
+                "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
                 "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
         symbols: new PackageCheck[] {
             HasDirectory("lib/net462").WithFiles(

diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec
@@ -48,7 +48,7 @@
     <file src = "$BIN_DIR$agents/net462/nunit-agent-net462-x86.exe.config" target="tools/agents/net462" />
     <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.agent.core.dll" target="tools/agents/net462" />
     <file src = "$BIN_DIR$agents/net462/nunit.extensibility.dll" target="tools/agents/net462" />
     <file src = "$BIN_DIR$agents/net462/nunit.extensibility.api.dll" target="tools/agents/net462" />
     <file src = "$BIN_DIR$agents/net462/nunit.common.dll" target="tools/agents/net462" />
@@ -62,7 +62,7 @@
     <file src = "$BIN_DIR$agents/net8.0/nunit-agent-net80.runtimeconfig.json" target="tools/agents/net8.0" />
     <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.agent.core.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit.extensibility.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit.extensibility.api.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />

diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
@@ -54,6 +54,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.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" />
     <file src="net8.0/nunit.extensibility.pdb" target="lib/net8.0" />
     <file src="net8.0/nunit.extensibility.api.dll" target="lib/net8.0" />
@@ -72,8 +74,8 @@
     <file src="agents/net462/nunit-agent-net462-x86.exe" target="agents/net462" />
     <file src="agents/net462/nunit-agent-net462-x86.pdb" target="agents/net462" />
     <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.agent.core.dll" target="agents/net462" />
+    <file src="agents/net462/nunit.agent.core.pdb" target="agents/net462" />
     <file src="agents/net462/nunit.extensibility.dll" target="agents/net462" />
     <file src="agents/net462/nunit.extensibility.pdb" target="agents/net462" />
     <file src="agents/net462/nunit.extensibility.api.dll" target="agents/net462" />
@@ -89,8 +91,8 @@
     <file src="agents/net8.0/nunit-agent-net80.dll.config" target="agents/net8.0" />
     <file src="agents/net8.0/nunit-agent-net80.deps.json" target="agents/net8.0" />
     <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.agent.core.dll" target="agents/net8.0" />
+    <file src="agents/net8.0/nunit.agent.core.pdb" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.extensibility.dll" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.extensibility.pdb" target="agents/net8.0" />
     <file src="agents/net8.0/nunit.extensibility.api.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.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" />
     <file src="net8.0/nunit.extensibility.pdb" target="tools/net8.0/any" />
     <file src="net8.0/nunit.extensibility.api.dll" target="tools/net8.0/any" />

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

diff --git a/...nunit.agent.core/TestPackageExtensions.cs → ...mon/nunit.common/TestPackageExtensions.cs b/...nunit.agent.core/TestPackageExtensions.cs → ...mon/nunit.common/TestPackageExtensions.cs
diff --git a/src/NUnitCommon/nunit.common/nunit.common.csproj b/src/NUnitCommon/nunit.common/nunit.common.csproj
@@ -17,8 +17,4 @@
     <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Runners\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/NUnitConsole/nunit4-console.tests/ExceptionHelperTests.cs b/src/NUnitConsole/nunit4-console.tests/ExceptionHelperTests.cs
@@ -6,7 +6,6 @@
 using System.Reflection;
 using NUnit.Common;
 using NUnit.Engine;
-using NUnit.Engine.Internal;
 using NUnit.Framework;
 
 namespace NUnit.ConsoleRunner

diff --git a/src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs b/src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs
@@ -10,7 +10,6 @@
 using NUnit.Framework;
 using NUnit.Framework.Api;
 using NUnit.TestData.Assemblies;
-using NUnit.Engine.Internal;
 
 namespace NUnit.ConsoleRunner
 {

diff --git a/src/NUnitEngine/nunit.engine.tests/Runners/TestEngineRunnerTests.cs b/src/NUnitEngine/nunit.engine.tests/Runners/TestEngineRunnerTests.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using System.Xml;
-using NUnit.Engine.Internal;
 using NUnit.Framework;
 using NUnit.TestData;
 using NUnit.TestData.Assemblies;

diff --git a/src/NUnitEngine/nunit.engine.tests/Services/TestFilteringTests.cs b/src/NUnitEngine/nunit.engine.tests/Services/TestFilteringTests.cs
@@ -2,13 +2,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using NUnit.Framework;
 using NUnit.TestData.Assemblies;
+using NUnit.Engine.Drivers;
 
 namespace NUnit.Engine.Services
 {
-    using Drivers;
 
     public class TestFilteringTests
     {

diff --git a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj" />
     <ProjectReference Include="..\..\TestData\mock-assembly\mock-assembly.csproj" />
     <ProjectReference Include="..\nunit.engine.api\nunit.engine.api.csproj" />
     <ProjectReference Include="..\nunit.engine\nunit.engine.csproj" />

diff --git a/...ent.core/Runners/NotRunnableTestRunner.cs → ...t.engine/Runners/NotRunnableTestRunner.cs b/...ent.core/Runners/NotRunnableTestRunner.cs → ...t.engine/Runners/NotRunnableTestRunner.cs
diff --git a/src/NUnitEngine/nunit.engine/Services/TestRunnerFactory.cs b/src/NUnitEngine/nunit.engine/Services/TestRunnerFactory.cs
@@ -50,26 +50,10 @@ public ITestEngineRunner MakeTestRunner(TestPackage package)
             if (ServiceContext == null)
                 throw new InvalidOperationException("ServiceContext not set.");
 
-#if !NETFRAMEWORK
-            if (package.SubPackages.Count > 1)
-                return new AggregatingTestRunner(ServiceContext, package);
-            else
-            {
-                var assemblyPackages = package.Select(p => p.IsAssemblyPackage());
-                switch (assemblyPackages.Count)
-                {
-                    default:
-                        return new AggregatingTestRunner(ServiceContext, package);
-                    case 1:
-                        return new LocalTestRunner(assemblyPackages[0]);
-                    case 0:
-                        return new LocalTestRunner(package);
-                }
-            }
-#else
             if (package.GetSetting(EnginePackageSettings.ImageTargetFrameworkName, "").StartsWith("Unmanaged,"))
                 return new UnmanagedExecutableTestRunner(package.FullName ?? "Package Suite");
 
+#if NETFRAMEWORK
             bool isNested = false;
             foreach (TestPackage subPackage in package.SubPackages)
             {
@@ -85,6 +69,22 @@ public ITestEngineRunner MakeTestRunner(TestPackage package)
                 return new MultipleTestProcessRunner(ServiceContext, package);
             else
                 return new ProcessRunner(ServiceContext, package);
+#else
+            if (package.SubPackages.Count > 1)
+                return new AggregatingTestRunner(ServiceContext, package);
+            else
+            {
+                var assemblyPackages = package.Select(p => p.IsAssemblyPackage());
+                switch (assemblyPackages.Count)
+                {
+                    default:
+                        return new AggregatingTestRunner(ServiceContext, package);
+                    case 1:
+                        return new LocalTestRunner(assemblyPackages[0]);
+                    case 0:
+                        return new LocalTestRunner(package);
+                }
+            }
 #endif
         }
     }

diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj
@@ -21,7 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj" />
+    <ProjectReference Condition="'$(TargetFramework)'=='net8.0'"
+                      Include="..\..\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj" />
     <ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
     <ProjectReference Include="..\..\NUnitCommon\nunit.extensibility\nunit.extensibility.csproj" />
     <ProjectReference Include="..\nunit.engine.api\nunit.engine.api.csproj" />