File tree 2 files changed +8
-4
lines changed
nunit.engine.core/Runners
2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ protected override TestEngineResult LoadPackage()
109
109
{
110
110
var testFile = subPackage . FullName ;
111
111
112
- string targetFramework = subPackage . GetSetting ( InternalEnginePackageSettings . ImageTargetFrameworkName , ( string ) null ) ;
112
+ string targetFramework = subPackage . GetSetting ( EnginePackageSettings . TargetRuntimeFramework , ( string ) null ) ;
113
113
bool skipNonTestAssemblies = subPackage . GetSetting ( EnginePackageSettings . SkipNonTestAssemblies , false ) ;
114
114
115
115
if ( _assemblyResolver != null && ! TestDomain . IsDefaultAppDomain ( )
Original file line number Diff line number Diff line change @@ -130,7 +130,7 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)
130
130
131
131
if ( string . IsNullOrEmpty ( imageTargetFrameworkNameSetting ) )
132
132
{
133
- // Assume .NET Framework
133
+ // Assume .NET Framework 2.0
134
134
targetRuntime = currentFramework . Runtime ;
135
135
targetVersion = package . GetSetting ( InternalEnginePackageSettings . ImageRuntimeVersion , new Version ( 2 , 0 ) ) ;
136
136
}
@@ -142,15 +142,19 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package)
142
142
{
143
143
case ".NETFramework" :
144
144
targetRuntime = RuntimeType . Net ;
145
+ targetVersion = frameworkName . Version ;
145
146
break ;
146
147
case ".NETCoreApp" :
147
148
targetRuntime = RuntimeType . NetCore ;
149
+ targetVersion = frameworkName . Version ;
150
+ break ;
151
+ case ".NETStandard" :
152
+ targetRuntime = RuntimeType . NetCore ;
153
+ targetVersion = new Version ( 3 , 1 ) ;
148
154
break ;
149
155
default :
150
156
throw new NUnitEngineException ( "Unsupported Target Framework: " + imageTargetFrameworkNameSetting ) ;
151
157
}
152
-
153
- targetVersion = frameworkName . Version ;
154
158
}
155
159
156
160
if ( ! new RuntimeFramework ( targetRuntime , targetVersion ) . IsAvailable )
You can’t perform that action at this time.
0 commit comments