Fix Double-loading of assemblies

.config/dotnet-tools.json

@@ -3,10 +3,25 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.0.0",
+      "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
     }
   }
 }

.github/workflows/NUnitConsoleAndEngine.CI.yml

@@ -0,0 +1,82 @@
+name: NUnitConsoleAndEngine.CI
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches-ignore:
+      - "azure-*"
+    paths-ignore:
+      - "*.txt"
+      - "*.md"
+
+env:
+  DOTNET_NOLOGO: true # Disable the .NET logo
+  DOTNET_CLI_TELEMETRY_OPTOUT: true # Disable sending .NET CLI telemetry
+
+jobs:
+  ContinuousIntegration:
+    name: Continuous Integration
+    runs-on: windows-latest
+
+    env:
+        MYGET_API_KEY: ${{ secrets.PUBLISH_MYGET_ORG }}
+        NUGET_API_KEY: ${{ secrets.PUBLISH_NUGET_ORG }}
+        CHOCO_API_KEY: ${{ secrets.PUBLISH_CHOCOLATEY_ORG }}
+        GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_CP }}
+
+    steps:
+      - name: ⤵️ Checkout Source
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+        # Ensure all required runtimes are available
+      - name: 🛠️ Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            3.1.x
+            6.0.x
+            7.0.x
+            8.0.x
+            9.0.x
+            10.0.x
+
+      - name: 🔧 Install dotnet tools
+        run: dotnet tool restore
+
+      - name: 🍰 Run cake
+        env:
+            MYGET_API_KEY: ${{ secrets.PUBLISH_MYGET_ORG }}
+            NUGET_API_KEY: ${{ secrets.PUBLISH_NUGET_ORG }}
+            CHOCO_API_KEY: ${{ secrets.PUBLISH_CHOCOLATEY_ORG }}
+            GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_CP }}
+
+        # If you need to get more verbose logging, add the following to the dotnet-cake above:  --verbosity=diagnostic
+        run: dotnet cake --target=ContinuousIntegration --configuration=Release
+
+      - name: 🪵 Upload build logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: NUnitConsoleLogs
+          # This path is defined in build-settings.cake
+          path: "build-results/*.binlog"
+          # if-no-files-found: error
+
+      - name: 🪵 Upload InternalTrace logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: InternalTraceLogs
+          # This path is defined in build-settings.cake
+          path: "*.log"
+          # if-no-files-found: error
+
+      - name: 💾 Upload test results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: "Test Results"
+          path: test-results

.github/workflows/PublishDraftRelease.yml

@@ -0,0 +1,33 @@
+name: Publish Draft Release on GitHub
+
+on:
+  workflow_dispatch:
+    inputs:
+      packageVersion:
+        description: "Package version for release (must match an existing milestone)"
+        required: true
+        type: string
+
+jobs:
+  draft-release:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: ⤵️ Checkout Source
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: 🛠️ Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.100
+
+    - name: 🛠️ Install dotnet tools
+      run: dotnet tool restore
+
+    - name: 🔨 Create Draft Release
+      env:
+        GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_CP }}
+
+      run: dotnet cake --target=CreateDraftRelease --packageVersion="${{ inputs.packageVersion }}"

.gitignore

@@ -176,7 +176,9 @@ TestResult.xml
 testCaseCollection.xml
 deploy
 lib
+build-results
 test-results
+build-results/
 package
 images
 MockAssemblyResult.xml

GitVersion.yml

@@ -1,12 +1,10 @@
-next-version: 3.14.0
+next-version: 3.22.0
 mode: ContinuousDelivery
-legacy-semver-padding: 5
-build-metadata-padding: 5
-commits-since-version-source-padding: 5
 branches:
-  master:
-    tag: dev
+  main:
+    regex: ^version3$
+    label: alpha
   release:
-    tag: pre
+    label: pre
   pull-request:
-    tag: pr
+    label: pr

KnownExtensions.cake

@@ -0,0 +1,70 @@
+using System.Reflection;
+
+// Static class holding information about known extensions.
+public static class KnownExtensions
+{
+    // Static Variables representing well-known Extensions with the latest tested version
+    public static ExtensionSpecifier NUnitV2Driver = new ExtensionSpecifier(
+        "NUnit.Extension.NUnitV2Driver", "nunit-extension-nunit-v2-driver", "3.9.0");
+    public static ExtensionSpecifier NUnitProjectLoader = new ExtensionSpecifier(
+        "NUnit.Extension.NUnitProjectLoader", "nunit-extension-nunit-project-loader", "3.8.0");
+    public static ExtensionSpecifier VSProjectLoader = new ExtensionSpecifier(
+        "NUnit.Extension.VSProjectLoader", "nunit-extension-vs-project-loader", "3.9.0");
+    public static ExtensionSpecifier NUnitV2ResultWriter = new ExtensionSpecifier(
+        "NUnit.Extension.NUnitV2ResultWriter", "nunit-extension-nunit-v2-result-writer", "3.8.0");
+    public static ExtensionSpecifier TeamCityEventListener = new ExtensionSpecifier(
+        "NUnit.Extension.TeamCityEventListener", "nunit-extension-teamcity-event-listener", "1.0.9");
+    public static ExtensionSpecifier Net462PluggableAgent = new ExtensionSpecifier(
+        "NUnit.Extension.Net462PluggableAgent", "nunit-extension-net462-pluggable-agent", "4.1.0-alpha.3");
+    public static ExtensionSpecifier Net80PluggableAgent = new ExtensionSpecifier(
+        "NUnit.Extension.Net80PluggableAgent", "nunit-extension-net80-pluggable-agent", "4.1.0-alpha.4");
+    public static ExtensionSpecifier Net90PluggableAgent = new ExtensionSpecifier(
+        "NUnit.Extension.Net90PluggableAgent", "nunit-extension-net90-pluggable-agent", "4.1.0-alpha.3");
+
+    private static FieldInfo[] ExtensionFields =>
+        typeof(KnownExtensions).GetFields(BindingFlags.Static | BindingFlags.Public).ToArray();
+
+    private static ExtensionSpecifier[] BundledAgents =>
+    [
+        Net462PluggableAgent,
+        Net80PluggableAgent,
+        Net90PluggableAgent
+    ];
+
+    public static IEnumerable<PackageReference> BundledNuGetAgents =>
+        BundledAgents.Select(a => a.NuGetPackage);
+
+    public static IEnumerable<PackageReference> BundledChocolateyAgents =>
+        BundledAgents.Select(a => a.ChocoPackage);
+
+    public static IEnumerable<ExtensionSpecifier> AllExtensions =>
+        ExtensionFields.Select(f => (ExtensionSpecifier)f.GetValue("Value")).ToArray();
+
+    public static IEnumerable<ExtensionSpecifier> AllAgents =>
+        AllExtensions.Where(ex => ex.NuGetId.EndsWith("PluggableAgent"));
+}
+
+Task("InstallBundledAgents")
+    .Description("Installs just the agents we bundle with the GUI runner.")
+    .Does(() =>
+    {
+        foreach (var agent in KnownExtensions.BundledNuGetAgents)
+            agent.Install(BuildSettings.ProjectDirectory + BIN_DIR);
+    });
+
+Task("InstallAllAgents")
+    .Description("Installs all known agents.")
+    .Does(() =>
+    {
+        foreach (var agent in KnownExtensions.AllAgents)
+            agent.NuGetPackage.Install(BuildSettings.ProjectDirectory + BIN_DIR);
+    });
+
+Task("InstallAllExtensions")
+    .Description("Installs all known extensions, both agents and others.")
+    .Does(() =>
+    {
+        foreach (var extension in KnownExtensions.AllExtensions)
+            extension.NuGetPackage.Install(BuildSettings.ProjectDirectory + BIN_DIR);
+    });
+

MixedTests.nunit

@@ -0,0 +1,11 @@
+<NUnitProject>
+  <Settings processModel="Default" domainUsage="Default" />
+  <Config name="Debug" appbase="bin/Debug">
+      <assembly path="testdata/net462/mock-assembly.dll" />
+      <assembly path="testdata/net6.0/mock-assembly.dll" />
+  </Config>
+  <Config name="Release" appbase="bin/Release">
+      <assembly path="testdata/net462/mock-assembly.dll" />
+      <assembly path="testdata/net6.0/mock-assembly.dll" />
+  </Config>
+</NUnitProject>