Ensure Loggers use late bound TraceLevel and Writer.

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.0.0",
+      "version": "5.0.0",
       "commands": [
         "dotnet-cake"
       ]

.editorconfig

@@ -2,7 +2,7 @@
 # maintain consistent coding styles between 
 # different editors and IDEs
 
-# http://EditorConfig.org
+# https://EditorConfig.org
 
 # top-most EditorConfig file
 root = true

.github/workflows/NUnitConsoleAndEngine.CI.yml

@@ -0,0 +1,78 @@
+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
+
+      - name: 🛠️ Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            3.1.x
+            6.0.x
+            8.0.100
+
+      - 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

@@ -185,6 +185,12 @@ tools
 !tools/packages.config
 bundled-extensions
 
+# =========================
+# NUnit 3 Directories not used in NUnit 4
+# =========================
+nunit3-console
+nunit3-netcore-console
+
 # =========================
 # Docker Mono build packages
 # =========================

BUILDING.md

@@ -1,9 +1,6 @@
 # Building NUnit 3 Console and Engine
 
-NUnit 3 consists of three separate layers: the Framework, the Engine and the Console Runner. This
-repository contains the Engine and Console Runner. The source code is kept in the GitHub repository
-at https://github.com/nunit/nunit-console. Source for the framework can be found
-at https://github.com/nunit/nunit
+NUnit 3 consists of three separate layers: the Framework, the Engine and the Console Runner. This repository contains the Engine and Console Runner. The source code is kept in the GitHub repository at https://github.com/nunit/nunit-console. Source for the framework can be found at https://github.com/nunit/nunit
 
 Note that assemblies in one layer must not reference those in any other layer, except as follows:
  * The console runner references the nunit.engine.api assembly, but not the nunit.engine assembly.
@@ -15,41 +12,39 @@ See also [Building and testing for Linux on a Windows machine](#building-and-tes
 
 ## Prerequisites
 
-- Visual Studio 2017 Update 5 or newer to build on Windows
-- .NET 4.5+ or Mono 5.10.0+
-- .NET Core 1.1.6 or newer
+- Visual Studio 2022 or newer to build on Windows
+- .NET 8.0 or newer
 
 ## Solution Build
 
 All projects are built together using a single Visual Studio solution NUnitConsole.sln, which may be
 built with Visual Studio or on the command line using Cake. The projects all place their output in
 a common bin directory.
 
+The solution build is useful for verifying that everything builds correctly but doesn't create packages or run any tests. Developers working on this project are advised to run the build script periodically.
+
 ## Build Script
 
-We use **Cake** (http://cakebuild.net) to build NUnit for distribution. The primary script that controls
-building, running tests and packaging is build.cake. We modify build.cake when we need to add new
-targets or change the way the build is done. Normally build.cake is not invoked directly but through
-build.ps1 (on Windows) or build.sh (on Linux). These two scripts are provided by the Cake project
-and ensure that Cake is properly installed before trying to run the cake script. This helps the
-build to work on CI servers using newly created agents to run the build and we generally run it
-the same way on our own machines.
-
-Key arguments to build.cmd / build.ps1 / build.sh :
- * --target=<task>                 The task to run (default is Build)
- * --configuration=[Release|Debug] The configuration to use (default is Release)
-
-The build.cake script contains a large number of interdependent tasks. The most
-important top-level tasks to use are listed here:
+We use **Cake** (https://cakebuild.net) to build NUnit for distribution. Our standard script targets are all wrapped in what **Cake** calls a recipe. `NUnit.Cake.Recpe` is currently used for building the runner, engine and a number of our extensions. To see all the various targets and options our recipe supports, enter `build --usage` at the command-line. **Note:** We cannot use `--help` because **Cake** uses that option for it's own help.
+
+The primary script that sets our options for building, running tests and packaging is `build.cake`. To reduce the size of `build.cake`, our package test definitions are included from a separate file, `package-tests.cake`. There are two places in the script where we specify options.
 
-```
- * Build               Builds everything. This is the default if no target is given.
- * Test                Runs all unit tests. Dependent on Build.
- * Package             Builds, Verifies and Tests all packages. Dependent on Build.
-```
+ 1. In the call to `BuildSettings.Initialize`, general options for he entire build are given. Eventually, we hope to add a help screen that explains the available options. At this time, you will need to examine the [source code](https://github.com/nunit/NUnit.Cake.Recipe/blob/main/recipe/build-settings.cake). 
+ 2. Our packages are all defined in `build.cake` by instantiating objects of type `NuGetPackage` or `ChocolateyPackage`. Once again, for documentation of available constructor arguments, you should examine the code for [NuGetPackage](https://github.com/nunit/NUnit.Cake.Recipe/blob/main/recipe/nuget-package.cake) and [ChocolatePackage](https://github.com/nunit/NUnit.Cake.Recipe/blob/main/recipe/chocolatey-package.cake).
+
+The build is normally started by running `build` or `build.ps1` on Windows or `build.sh` on Linux. The three comands are functionally identical. They check that the necessary software is installed and then run `dotnet cake`. When running on a local machine where you know that everything is properly installed, you may use `dotnet cake` directly but it should not be used on uninitialized build agents.
+
+For development purposes, the usual commands to run are...
+ * `build` alone, to simply compile everything.
+ * `build -t Test` to compile and run unit tests.
+ * `build -t Package` to compile, create packages and test them.
+ * `build -t Test -t Package` to compile, unit test and create and test packages.
 
 ### Building and testing for Linux on a Windows machine
 
+> _**NOTE:** Instructions in this section have not yet been verified on the latest build of the console and engine.
+If you find problems, please file an issue._
+
 Most of the time, it's not necessary to build or run tests on platforms other than your primary
 platform. The continuous integration which runs on every PR is enough to catch any problems.
 

CHANGES.txt

@@ -1 +1 @@
-For the latest list of changes to the NUnit Console Runner, please see the Console and Engine release notes on the NUnit Docs site at https://docs.nunit.org/articles/nunit/release-notes/console-and-engine.html
+For the latest list of changes to the NUnit Console Runner, please see the Console and Engine release notes on the NUnit Docs site at https://docs.nunit.org/articles/nunit-engine/release-notes.html

GitVersion.yml

@@ -1,11 +1,12 @@
-next-version: 3.14.0
+next-version: 4.0.0
 mode: ContinuousDelivery
 legacy-semver-padding: 5
 build-metadata-padding: 5
 commits-since-version-source-padding: 5
 branches:
   master:
-    tag: dev
+    regex: ^(main|version4)$
+    tag: alpha
   release:
     tag: pre
   pull-request:

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>

MockCppAssemblies.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x64", "src\NUnitEngine\mock-cpp-clr\mock-cpp-clr-x64.vcxproj", "{FFF45826-991F-465B-8A03-0E1DB7E8F38C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x64", "src\TestData\mock-cpp-clr\mock-cpp-clr-x64.vcxproj", "{FFF45826-991F-465B-8A03-0E1DB7E8F38C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x86", "src\NUnitEngine\mock-cpp-clr\mock-cpp-clr-x86.vcxproj", "{11640C9F-03A3-456B-848D-9B4A126F9506}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x86", "src\TestData\mock-cpp-clr\mock-cpp-clr-x86.vcxproj", "{11640C9F-03A3-456B-848D-9B4A126F9506}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution