Fix exception thrown for .NET Standard assemblies... again!

CharliePoole · CharliePoole · commit 69a949070c65 · 2024-06-12T11:31:49.000-07:00
diff --git 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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)`
`140`	`140`
`141`	`141`	`if (string.IsNullOrEmpty(imageTargetFrameworkNameSetting))`
`142`	`142`	`{`
`143`		`- // Assume .NET Framework`
	`143`	`+ // Assume .NET Framework 2.0`
`144`	`144`	`targetRuntime = currentFramework.Runtime;`
`145`	`145`	`targetVersion = package.GetSetting(InternalEnginePackageSettings.ImageRuntimeVersion, new Version(2, 0));`
`146`	`146`	`}`
`@@ -152,15 +152,19 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)`
`152`	`152`	`{`
`153`	`153`	`case ".NETFramework":`
`154`	`154`	`targetRuntime = RuntimeType.Net;`
	`155`	`+ targetVersion = frameworkName.Version;`
`155`	`156`	`break;`
`156`	`157`	`case ".NETCoreApp":`
`157`	`158`	`targetRuntime = RuntimeType.NetCore;`
	`159`	`+ targetVersion = frameworkName.Version;`
	`160`	`+ break;`
	`161`	`+ case ".NETStandard":`
	`162`	`+ targetRuntime = RuntimeType.NetCore;`
	`163`	`+ targetVersion = new Version(3, 1);`
`158`	`164`	`break;`
`159`	`165`	`default:`
`160`	`166`	`throw new NUnitEngineException("Unsupported Target Framework: " + imageTargetFrameworkNameSetting);`
`161`	`167`	`}`
`162`		`-`
`163`		`- targetVersion = frameworkName.Version;`
`164`	`168`	`}`
`165`	`169`
`166`	`170`	`if (!IsAvailable(new RuntimeFramework(targetRuntime, targetVersion).Id, runAsX86))`