Skip to content

Commit 15ab67e

Browse files
committed
Target frameworks not matching
Nuget.Frameworks started returning DotNetFrameworkName as "net5.0" which is what vstest will pass down as the target framework name. There is some guidance how to do that better, but this is a quick fix to be able to run xUnit tests on net5.0-preview8 and newer, before we figure out the best way to do this.
1 parent fe8f766 commit 15ab67e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/xunit.runner.visualstudio/Utility/RunSettings.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,17 @@ public bool IsMatchingTargetFramework()
113113

114114
#if NETCOREAPP
115115
return string.IsNullOrWhiteSpace(TargetFrameworkVersion) ||// Short circuit on null since we don't have anything to detect, return true
116-
(TargetFrameworkVersion.StartsWith(".NETCoreApp,", StringComparison.OrdinalIgnoreCase) ||
116+
(TargetFrameworkVersion.StartsWith("net5", StringComparison.OrdinalIgnoreCase) ||
117+
TargetFrameworkVersion.StartsWith(".NETCoreApp,", StringComparison.OrdinalIgnoreCase) ||
117118
TargetFrameworkVersion.StartsWith("FrameworkCore10", StringComparison.OrdinalIgnoreCase));
118119
#elif WINDOWS_UAP
119120
return string.IsNullOrWhiteSpace(TargetFrameworkVersion) || // Short circuit on null since we don't have anything to detect, return true
120-
(TargetFrameworkVersion.StartsWith(".NETCore,", StringComparison.OrdinalIgnoreCase) ||
121+
TargetFrameworkVersion.StartsWith(".NETCore,", StringComparison.OrdinalIgnoreCase) ||
121122
TargetFrameworkVersion.StartsWith("Uap,", StringComparison.OrdinalIgnoreCase) ||
122123
TargetFrameworkVersion.StartsWith("FrameworkUap10", StringComparison.OrdinalIgnoreCase));
123124
#else
124125
if (!string.IsNullOrWhiteSpace(TargetFrameworkVersion) &&
125-
(TargetFrameworkVersion.StartsWith(".NETCore", StringComparison.OrdinalIgnoreCase) ||
126+
TargetFrameworkVersion.StartsWith(".NETCore", StringComparison.OrdinalIgnoreCase) ||
126127
TargetFrameworkVersion.StartsWith("Uap,", StringComparison.OrdinalIgnoreCase) ||
127128
TargetFrameworkVersion.StartsWith("FrameworkCore10", StringComparison.OrdinalIgnoreCase) ||
128129
TargetFrameworkVersion.StartsWith("FrameworkUap10", StringComparison.OrdinalIgnoreCase)))

0 commit comments

Comments
 (0)