Skip to content

Commit f76d141

Browse files
committed
Allow .NET Standard assemblies when loading a VS solution
1 parent 7ff4501 commit f76d141

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/NUnitEngine/nunit.engine.core/Runners/DirectTestRunner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected override TestEngineResult LoadPackage()
109109
{
110110
var testFile = subPackage.FullName;
111111

112-
string targetFramework = subPackage.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, (string)null);
112+
string targetFramework = subPackage.GetSetting(EnginePackageSettings.TargetRuntimeFramework, (string)null);
113113
bool skipNonTestAssemblies = subPackage.GetSetting(EnginePackageSettings.SkipNonTestAssemblies, false);
114114

115115
if (_assemblyResolver != null && !TestDomain.IsDefaultAppDomain()

src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)
130130

131131
if (string.IsNullOrEmpty(imageTargetFrameworkNameSetting))
132132
{
133-
// Assume .NET Framework
133+
// Assume .NET Framework 2.0
134134
targetRuntime = currentFramework.Runtime;
135135
targetVersion = package.GetSetting(InternalEnginePackageSettings.ImageRuntimeVersion, new Version(2, 0));
136136
}
@@ -142,15 +142,19 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)
142142
{
143143
case ".NETFramework":
144144
targetRuntime = RuntimeType.Net;
145+
targetVersion = frameworkName.Version;
145146
break;
146147
case ".NETCoreApp":
147148
targetRuntime = RuntimeType.NetCore;
149+
targetVersion = frameworkName.Version;
150+
break;
151+
case ".NETStandard":
152+
targetRuntime = RuntimeType.NetCore;
153+
targetVersion = new Version(3, 1);
148154
break;
149155
default:
150156
throw new NUnitEngineException("Unsupported Target Framework: " + imageTargetFrameworkNameSetting);
151157
}
152-
153-
targetVersion = frameworkName.Version;
154158
}
155159

156160
if (!new RuntimeFramework(targetRuntime, targetVersion).IsAvailable)

0 commit comments

Comments
 (0)