Avoid unnecessary loading of agents

CharliePoole · CharliePoole · commit 710d187adc13 · 2025-10-02T03:15:25.000-07:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -6,7 +6,22 @@
       "version": "5.0.0",
       "commands": [
         "dotnet-cake"
-      ]
+      ],
+      "rollForward": false
+    },
+    "gitversion.tool": {
+      "version": "6.4.0",
+      "commands": [
+        "dotnet-gitversion"
+      ],
+      "rollForward": false
+    },
+    "gitreleasemanager.tool": {
+      "version": "0.20.0",
+      "commands": [
+        "dotnet-gitreleasemanager"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,13 +1,9 @@
 next-version: 4.0.0
 mode: ContinuousDelivery
-legacy-semver-padding: 5
-build-metadata-padding: 5
-commits-since-version-source-padding: 5
 branches:
-  master:
-    regex: ^(main|version4)$
-    tag: beta.1
+  main:
+    label: beta.1
   release:
-    tag: pre
+    label: pre
   pull-request:
-    tag: pr
+    label: pr
diff --git a/build.cake b/build.cake
@@ -154,9 +154,9 @@ PackageDefinition NUnitConsoleRunnerNuGetPackage = new PackageDefinition(
             "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"),
-        HasDependency("NUnit.Extension.Net462PluggableAgent", "4.1.0-alpha.3"),
-        HasDependency("NUnit.Extension.Net80PluggableAgent", "4.1.0-alpha.4"),
-        HasDependency("NUnit.Extension.Net90PluggableAgent", "4.1.0-alpha.3")
+        HasDependency("NUnit.Extension.Net462PluggableAgent", "4.1.0-alpha.5"),
+        HasDependency("NUnit.Extension.Net80PluggableAgent", "4.1.0-alpha.6"),
+        HasDependency("NUnit.Extension.Net90PluggableAgent", "4.1.0-alpha.4")
     },
     symbols: new PackageCheck[] {
         HasDirectory("tools").WithFiles(
@@ -184,9 +184,9 @@ PackageDefinition NUnitConsoleRunnerChocolateyPackage = new PackageDefinition(
             "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "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"),
-        HasDependency("nunit-extension-net462-pluggable-agent", "4.1.0-alpha.3"),
-        HasDependency("nunit-extension-net80-pluggable-agent", "4.1.0-alpha.4"),
-        HasDependency("nunit-extension-net90-pluggable-agent", "4.1.0-alpha.3")
+        HasDependency("nunit-extension-net462-pluggable-agent", "4.1.0-alpha.5"),
+        HasDependency("nunit-extension-net80-pluggable-agent", "4.1.0-alpha.6"),
+        HasDependency("nunit-extension-net90-pluggable-agent", "4.1.0-alpha.4")
     },
     testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
         + $"nunit-console-runner.{BuildSettings.ChocolateyPackageVersion}/tools/nunit-console.exe"),
@@ -273,6 +273,19 @@ public class DirectTestAgentRunner : TestRunner, IPackageTestRunner
     }
 }
 
+//////////////////////////////////////////////////////////////////////
+// ADDITIONAL TARGETS USED IN DEVELOPMENT
+//////////////////////////////////////////////////////////////////////
+
+Task("InstallBundledAgents")
+    .Description("Installs just the agents we bundle with the GUI runner.")
+    .Does(() =>
+    {
+        new PackageReference("NUnit.Extension.Net462PluggableAgent", "4.1.0-alpha.5").Install(BuildSettings.ProjectDirectory + "bin");
+        new PackageReference("NUnit.Extension.Net80PluggableAgent", "4.1.0-alpha.6").Install(BuildSettings.ProjectDirectory + "bin");
+        new PackageReference("NUnit.Extension.Net90PluggableAgent", "4.1.0-alpha.4").Install(BuildSettings.ProjectDirectory + "bin");
+    });
+
 //////////////////////////////////////////////////////////////////////
 // EXECUTION
 //////////////////////////////////////////////////////////////////////
diff --git a/cake/package-tests.cake b/cake/package-tests.cake
@@ -640,13 +640,13 @@ var AgentCoreTests = new List<PackageTest>()
     new PackageTest(1, "Net462AgentTest")
     {
         Description = "Run mock-assembly.dll under .NET 4.6.2",
-        Arguments = "testdata/net462/mock-assembly.dll",
+        Arguments = "testdata/net462/mock-assembly.dll --trace:Debug",
         ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2")
     },
     new PackageTest(1, "Net80AgentTest")
     {
         Description = "Run mock-assembly.dll under .NET 8.0",
-        Arguments = "testdata/net8.0/mock-assembly.dll",
+        Arguments = "testdata/net8.0/mock-assembly.dll --trace:Debug",
         ExpectedResult = new MockAssemblyExpectedResult("netcore-8.0")
     }
 };
diff --git a/cake/utilities.cake b/cake/utilities.cake
@@ -1,7 +1,7 @@
 // Load all tools used by the recipe
 #tool NuGet.CommandLine&version=6.9.1
-#tool dotnet:?package=GitVersion.Tool&version=5.12.0
-#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0
+#tool dotnet:?package=GitVersion.Tool&version=6.4.0
+#tool dotnet:?package=GitReleaseManager.Tool&version=0.20.0
 #addin nuget:?package=Cake.Git&version=5.0.1
 
 // Using statements needed in the scripts
diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec
@@ -25,9 +25,9 @@
     <tags>nunit console runner test testing tdd</tags>
     <copyright>Copyright (c) 2021 Charlie Poole, Rob Prouse</copyright>
     <dependencies>
-      <dependency id="nunit-extension-net462-pluggable-agent" version="4.1.0-alpha.3" />
-      <dependency id="nunit-extension-net80-pluggable-agent" version="4.1.0-alpha.4" />
-      <dependency id="nunit-extension-net90-pluggable-agent" version="4.1.0-alpha.3" />
+      <dependency id="nunit-extension-net462-pluggable-agent" version="4.1.0-alpha.5" />
+      <dependency id="nunit-extension-net80-pluggable-agent" version="4.1.0-alpha.6" />
+      <dependency id="nunit-extension-net90-pluggable-agent" version="4.1.0-alpha.4" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec
@@ -23,9 +23,9 @@
     <tags>nunit test testing tdd runner</tags>
     <copyright>Copyright (c) 2021 Charlie Poole, Rob Prouse</copyright>
     <dependencies>
-      <dependency id="NUnit.Extension.Net462PluggableAgent" version="4.1.0-alpha.3" />
-      <dependency id="NUnit.Extension.Net80PluggableAgent" version="4.1.0-alpha.4" />
-      <dependency id="NUnit.Extension.Net90PluggableAgent" version="4.1.0-alpha.3" />
+      <dependency id="NUnit.Extension.Net462PluggableAgent" version="4.1.0-alpha.5" />
+      <dependency id="NUnit.Extension.Net80PluggableAgent" version="4.1.0-alpha.6" />
+      <dependency id="NUnit.Extension.Net90PluggableAgent" version="4.1.0-alpha.4" />
     </dependencies>
   </metadata>
   <files>
diff --git a/src/NUnitCommon/DirectTestAgent/DirectTestAgent.cs b/src/NUnitCommon/DirectTestAgent/DirectTestAgent.cs
@@ -1,5 +1,7 @@
 ﻿// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
+using System.Diagnostics;
+
 namespace NUnit.Agents
 {
     public class DirectTestAgent : NUnitAgent<DirectTestAgent>
diff --git a/src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs b/src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs
@@ -36,23 +36,22 @@ public DriverService()
         {
             _factories.Add(new NUnit3DriverFactory());
 
-#if NETFRAMEWORK // TODO: Restore extensibility to .NET 8.0 build
-            var extensionManager = new ExtensionManager()
-            {
-                TypeExtensionPath = TYPE_EXTENSION_PATH,
-                PackagePrefixes = [PACKAGE_PREFIX]
-            };
-
-            extensionManager.FindExtensionPoints(THIS_ASSEMBLY);
-            extensionManager.FindExtensionAssemblies(THIS_ASSEMBLY);
-
-            foreach (IDriverFactory factory in extensionManager.GetExtensions<IDriverFactory>())
-                _factories.Add(factory);
-
-            var node = extensionManager.GetExtensionNode("/NUnit/Engine/NUnitV2Driver");
-            if (node is not null)
-                _factories.Add(new NUnit2DriverFactory(node));
-#endif
+            // TODO: Restore extensibility to Driver Service
+            //var extensionManager = new ExtensionManager()
+            //{
+            //    TypeExtensionPath = TYPE_EXTENSION_PATH,
+            //    PackagePrefixes = [PACKAGE_PREFIX]
+            //};
+
+            //extensionManager.FindExtensionPoints(THIS_ASSEMBLY);
+            //extensionManager.FindExtensionAssemblies(THIS_ASSEMBLY);
+
+            //foreach (IDriverFactory factory in extensionManager.GetExtensions<IDriverFactory>())
+            //    _factories.Add(factory);
+
+            //var node = extensionManager.GetExtensionNode("/NUnit/Engine/NUnitV2Driver");
+            //if (node is not null)
+            //    _factories.Add(new NUnit2DriverFactory(node));
         }
 
         /// <summary>
diff --git a/src/NUnitCommon/nunit.common/AssemblyHelper.cs b/src/NUnitCommon/nunit.common/AssemblyHelper.cs
@@ -53,9 +53,9 @@ private static bool IsFileUri(string uri)
         /// <summary>
         /// Gets the assembly path from code base.
         /// </summary>
-        /// <remarks>Public for testing purposes</remarks>
+        /// <remarks>Internal for testing purposes</remarks>
         /// <param name="codeBase">The code base.</param>
-        public static string GetAssemblyPathFromCodeBase(string codeBase)
+        internal static string GetAssemblyPathFromCodeBase(string codeBase)
         {
             // Skip over the file:// part
             int start = Uri.UriSchemeFile.Length + Uri.SchemeDelimiter.Length;
diff --git a/src/NUnitCommon/nunit.common/CurrentMessageCounter.cs b/src/NUnitCommon/nunit.common/CurrentMessageCounter.cs
diff --git a/src/NUnitCommon/nunit.extensibility/ExtensionManager.cs b/src/NUnitCommon/nunit.extensibility/ExtensionManager.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
diff --git a/src/NUnitEngine/nunit.engine.api/Extensibility/IResultWriter.cs b/src/NUnitEngine/nunit.engine.api/Extensibility/IResultWriter.cs
@@ -17,6 +17,7 @@ public interface IResultWriter
         /// Checks if the output path is writable. If the output is not
         /// writable, this method should throw an exception.
         /// </summary>
+        /// <param name="outputPath">The path to be checked</param>
         void CheckWritability(string outputPath);
 
         /// <summary>
diff --git a/src/NUnitEngine/nunit.engine/Services/TestAgency.cs b/src/NUnitEngine/nunit.engine/Services/TestAgency.cs

Original file line number	Diff line number	Diff line change
`@@ -640,13 +640,13 @@ var AgentCoreTests = new List<PackageTest>()`
`640`	`640`	`new PackageTest(1, "Net462AgentTest")`
`641`	`641`	`{`
`642`	`642`	`Description = "Run mock-assembly.dll under .NET 4.6.2",`
`643`		`- Arguments = "testdata/net462/mock-assembly.dll",`
	`643`	`+ Arguments = "testdata/net462/mock-assembly.dll --trace:Debug",`
`644`	`644`	`ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2")`
`645`	`645`	`},`
`646`	`646`	`new PackageTest(1, "Net80AgentTest")`
`647`	`647`	`{`
`648`	`648`	`Description = "Run mock-assembly.dll under .NET 8.0",`
`649`		`- Arguments = "testdata/net8.0/mock-assembly.dll",`
	`649`	`+ Arguments = "testdata/net8.0/mock-assembly.dll --trace:Debug",`
`650`	`650`	`ExpectedResult = new MockAssemblyExpectedResult("netcore-8.0")`
`651`	`651`	`}`
`652`	`652`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt`
`2`	`2`
	`3`	`+using System.Diagnostics;`
	`4`	`+`
`3`	`5`	`namespace NUnit.Agents`
`4`	`6`	`{`
`5`	`7`	`public class DirectTestAgent : NUnitAgent<DirectTestAgent>`