Wrong assembly resolving logic when several runtimes are installed and assembly is missing in deps.json

.config/dotnet-tools.json

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

BUILDING.md

@@ -15,16 +15,28 @@ 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
+- Visual Studio 2017 Update 5 or newer to build on Windows. Preferably use VS2022.
 - .NET 4.5+ or Mono 5.10.0+
-- .NET Core 1.1.6 or newer
+- A set of runtimes, from .NET Core 2.1.30 runtime, and some more, see below. You will also need the net framework 3.5 service pack 1 installed.
+- An appropriate newer dotnet SDK, e.g. .net 6. 
+- Chocolatey  : [Install instructions here](https://docs.chocolatey.org/en-us/choco/setup)
+- Wix: [Install instructions here](https://wixtoolset.org/docs/wix3/). Note that you need to install both the [3.11 toolset](https://github.com/wixtoolset/wix3/releases/tag/wix3112rtm) (Use the wix311.exe installer)  and the [VS2022 Vsix extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
 
 ## 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 easiest way is to use the command line with just `build`.  If that works, you can test it doing `build -t test` and then create a package doing `build -t package`.
+On each step you may get some errors, mostly due to missing frameworks. Install whatever is required. We will work on getting a complete list up.
+The generated packages can be found in the `package` subfolder.
+
+## Setting a new version
+
+Before building a new package, ensure you set the appropriate (according to [Semver](https://semver.org) ) next version number to be used for the final package. Note that you dont need to set any prerelase tags, those will be done automatically based on whatever non-main branch you are building from.
+You set that version number in the 1st line of the `gitversion.yml` file.
+
 ## Build Script
 
 We use **Cake** (http://cakebuild.net) to build NUnit for distribution. The primary script that controls

CopyAgentFiles.bat

@@ -0,0 +1,15 @@
+:: As each target runtime build is completed, we copy the agent files to
+:: both the console and engine output directories, so they are available
+:: for running tests and packaging. Supporting assemblies are copied too.
+:: This batch filecopies agent files from one location to another as
+:: specified by the two arguments
+
+set SOURCE_FILES=%1
+set TARGET_DIR=%2
+
+echo Copying agent files
+echo  from %SOURCE_FILES%
+echo    to %TARGET_DIR%
+xcopy %SOURCE_FILES% %TARGET_DIR% /S /Y /Q
+
+exit 0

GitVersion.yml

@@ -1,4 +1,4 @@
-next-version: 3.14.0
+next-version: 3.16.3
 mode: ContinuousDelivery
 legacy-semver-padding: 5
 build-metadata-padding: 5

NUnitConsole.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}"
 	ProjectSection(SolutionItems) = preProject
@@ -17,9 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CHANGES.txt = CHANGES.txt
 		ci.cake = ci.cake
 		CONTRIBUTING.md = CONTRIBUTING.md
+		CopyAgentFiles.bat = CopyAgentFiles.bat
 		src\Directory.Build.props = src\Directory.Build.props
 		GitReleaseManager.yaml = GitReleaseManager.yaml
 		GitVersion.yml = GitVersion.yml
+		global.json = global.json
 		header-check.cake = header-check.cake
 		LICENSE.txt = LICENSE.txt
 		NetFXTests.nunit = NetFXTests.nunit
@@ -34,6 +36,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A972031D-2F61-4183-AF75-99EE1A9F6B32}"
+	ProjectSection(SolutionItems) = preProject
+		nuget\nunit.agent.addins = nuget\nunit.agent.addins
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitEngine", "NUnitEngine", "{31B45C4C-206F-4F31-9CC6-33BF11DFEE39}"
 EndProject
@@ -63,15 +68,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit3-console.tests", "src
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "engine", "engine", "{43A219A8-2995-4884-806F-FDB9CD25D403}"
 	ProjectSection(SolutionItems) = preProject
-		nuget\engine\nunit.agent.addins = nuget\engine\nunit.agent.addins
 		nuget\engine\nunit.engine.api.nuspec = nuget\engine\nunit.engine.api.nuspec
 		nuget\engine\nunit.engine.nuget.addins = nuget\engine\nunit.engine.nuget.addins
 		nuget\engine\nunit.engine.nuspec = nuget\engine\nunit.engine.nuspec
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runners", "runners", "{F3E87D0F-6F06-4C0B-AE06-42C0834C3C6E}"
 	ProjectSection(SolutionItems) = preProject
-		nuget\runners\nunit.agent.addins = nuget\runners\nunit.agent.addins
+		nuget\runners\DotnetToolSettings.xml = nuget\runners\DotnetToolSettings.xml
 		nuget\runners\nunit.console-runner-with-extensions.nuspec = nuget\runners\nunit.console-runner-with-extensions.nuspec
 		nuget\runners\nunit.console-runner.netcore.nuspec = nuget\runners\nunit.console-runner.netcore.nuspec
 		nuget\runners\nunit.console-runner.nuspec = nuget\runners\nunit.console-runner.nuspec
@@ -111,12 +115,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{9BCA00E2-D072-424B-A6DF-5BECF719C1FB}"
 	ProjectSection(SolutionItems) = preProject
+		cake\build-settings.cake = cake\build-settings.cake
 		cake\constants.cake = cake\constants.cake
 		cake\header-check.cake = cake\header-check.cake
 		cake\package-checks.cake = cake\package-checks.cake
 		cake\package-definitions.cake = cake\package-definitions.cake
-		cake\package-tester.cake = cake\package-tester.cake
-		cake\package-tests.cake = cake\package-tests.cake
+		cake\packages.cake = cake\packages.cake
 		cake\test-results.cake = cake\test-results.cake
 		cake\utilities.cake = cake\utilities.cake
 		cake\versioning.cake = cake\versioning.cake
@@ -134,6 +138,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{20005864-BE8
 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit3-netcore-console", "src\NUnitConsole\nunit3-netcore-console\nunit3-netcore-console.csproj", "{472314FE-1F18-4359-B620-FF20BF3AF553}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "windows-test", "src\NUnitEngine\windows-test\windows-test.csproj", "{D3A28EEB-A7C4-4A03-B958-4D161C208963}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore-test", "src\NUnitEngine\aspnetcore-test\aspnetcore-test.csproj", "{25FFAF61-C456-4BF9-87BE-34930F22B669}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -188,6 +198,18 @@ Global
 		{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
+		{472314FE-1F18-4359-B620-FF20BF3AF553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{472314FE-1F18-4359-B620-FF20BF3AF553}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{472314FE-1F18-4359-B620-FF20BF3AF553}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{472314FE-1F18-4359-B620-FF20BF3AF553}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3A28EEB-A7C4-4A03-B958-4D161C208963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3A28EEB-A7C4-4A03-B958-4D161C208963}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3A28EEB-A7C4-4A03-B958-4D161C208963}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3A28EEB-A7C4-4A03-B958-4D161C208963}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25FFAF61-C456-4BF9-87BE-34930F22B669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25FFAF61-C456-4BF9-87BE-34930F22B669}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25FFAF61-C456-4BF9-87BE-34930F22B669}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25FFAF61-C456-4BF9-87BE-34930F22B669}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -214,6 +236,9 @@ Global
 		{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{20005864-BE82-412D-99BF-288E2D8370E9} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
+		{472314FE-1F18-4359-B620-FF20BF3AF553} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
+		{D3A28EEB-A7C4-4A03-B958-4D161C208963} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
+		{25FFAF61-C456-4BF9-87BE-34930F22B669} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}