From 69a949070c65a0ff67800660083dabf5d9d27583 Mon Sep 17 00:00:00 2001
From: Charlie Poole <charliepoole@gmail.com>
Date: Wed, 12 Jun 2024 11:31:49 -0700
Subject: [PATCH] Fix exception thrown for .NET Standard assemblies... again!

---
 cake/package-tests.cake                                |  2 +-
 .../nunit.engine/Services/RuntimeFrameworkService.cs   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cake/package-tests.cake b/cake/package-tests.cake
index 2b5413ab2..7b76d14fe 100644
--- a/cake/package-tests.cake
+++ b/cake/package-tests.cake
@@ -75,7 +75,7 @@ static PackageTest Net60Test = new PackageTest(
 static PackageTest Net60X86Test = new PackageTest(
     "Net60X86Test",
     "Run mock-assembly-x86.dll under .NET 6.0",
-    "net6.0/mock-assembly-x86.dll --trace:Debug",
+    "net6.0/mock-assembly-x86.dll",
     MockAssemblyExpectedResult(1));
 
 static PackageTest Net50Test = new PackageTest(
diff --git a/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs b/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs
index 673b76420..e1f7538d1 100644
--- a/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs
+++ b/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs
@@ -140,7 +140,7 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)
 
             if (string.IsNullOrEmpty(imageTargetFrameworkNameSetting))
             {
-                // Assume .NET Framework
+                // Assume .NET Framework 2.0
                 targetRuntime = currentFramework.Runtime;
                 targetVersion = package.GetSetting(InternalEnginePackageSettings.ImageRuntimeVersion, new Version(2, 0));
             }
@@ -152,15 +152,19 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)
                 {
                     case ".NETFramework":
                         targetRuntime = RuntimeType.Net;
+                        targetVersion = frameworkName.Version;
                         break;
                     case ".NETCoreApp":
                         targetRuntime = RuntimeType.NetCore;
+                        targetVersion = frameworkName.Version;
+                        break;
+                    case ".NETStandard":
+                        targetRuntime = RuntimeType.NetCore;
+                        targetVersion = new Version(3, 1);
                         break;
                     default:
                         throw new NUnitEngineException("Unsupported Target Framework: " + imageTargetFrameworkNameSetting);
                 }
-
-                targetVersion = frameworkName.Version;
             }
 
             if (!IsAvailable(new RuntimeFramework(targetRuntime, targetVersion).Id, runAsX86))