Merge pull request #1268 from nunit/issue-1182

Don't throw exception when VS Solution contains a .NET Standard assembly
nunit · Nov 14, 2022 · 00d8d5e · 00d8d5e
2 parents 7ff4501 + f76d141
commit 00d8d5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/NUnitEngine/nunit.engine.core/Runners/DirectTestRunner.cs b/src/NUnitEngine/nunit.engine.core/Runners/DirectTestRunner.cs
@@ -109,7 +109,7 @@ protected override TestEngineResult LoadPackage()
             {
                 var testFile = subPackage.FullName;
 
-                string targetFramework = subPackage.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, (string)null);
+                string targetFramework = subPackage.GetSetting(EnginePackageSettings.TargetRuntimeFramework, (string)null);
                 bool skipNonTestAssemblies = subPackage.GetSetting(EnginePackageSettings.SkipNonTestAssemblies, false);
 
                 if (_assemblyResolver != null && !TestDomain.IsDefaultAppDomain()

diff --git a/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs b/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs
@@ -130,7 +130,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));
             }
@@ -142,15 +142,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 (!new RuntimeFramework(targetRuntime, targetVersion).IsAvailable)