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.
xunit · Aug 3, 2020 · 15ab67e · 15ab67e
1 parent fe8f766
commit 15ab67e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/xunit.runner.visualstudio/Utility/RunSettings.cs b/src/xunit.runner.visualstudio/Utility/RunSettings.cs
@@ -113,16 +113,17 @@ public bool IsMatchingTargetFramework()
 
 #if NETCOREAPP
             return string.IsNullOrWhiteSpace(TargetFrameworkVersion) ||// Short circuit on null since we don't have anything to detect, return true
-                   (TargetFrameworkVersion.StartsWith(".NETCoreApp,", StringComparison.OrdinalIgnoreCase) ||
+                   (TargetFrameworkVersion.StartsWith("net5", StringComparison.OrdinalIgnoreCase) ||
+                   TargetFrameworkVersion.StartsWith(".NETCoreApp,", StringComparison.OrdinalIgnoreCase) ||
                    TargetFrameworkVersion.StartsWith("FrameworkCore10", StringComparison.OrdinalIgnoreCase));
 #elif WINDOWS_UAP
             return string.IsNullOrWhiteSpace(TargetFrameworkVersion) || // Short circuit on null since we don't have anything to detect, return true
-                   (TargetFrameworkVersion.StartsWith(".NETCore,", StringComparison.OrdinalIgnoreCase) ||
+                   TargetFrameworkVersion.StartsWith(".NETCore,", StringComparison.OrdinalIgnoreCase) ||
                    TargetFrameworkVersion.StartsWith("Uap,", StringComparison.OrdinalIgnoreCase) ||
                    TargetFrameworkVersion.StartsWith("FrameworkUap10", StringComparison.OrdinalIgnoreCase));
 #else
             if (!string.IsNullOrWhiteSpace(TargetFrameworkVersion) && 
-                (TargetFrameworkVersion.StartsWith(".NETCore", StringComparison.OrdinalIgnoreCase) ||
+                TargetFrameworkVersion.StartsWith(".NETCore", StringComparison.OrdinalIgnoreCase) ||
                 TargetFrameworkVersion.StartsWith("Uap,", StringComparison.OrdinalIgnoreCase) ||
                 TargetFrameworkVersion.StartsWith("FrameworkCore10", StringComparison.OrdinalIgnoreCase) ||
                 TargetFrameworkVersion.StartsWith("FrameworkUap10", StringComparison.OrdinalIgnoreCase)))