Added support for detecting .NET 5.0+ as .NET Core

Sustainsys · Nov 25, 2021 · 9fccf41 · 9fccf41
1 parent 75e1a8f
commit 9fccf41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Sustainsys.Saml2.Metadata/Helpers/EnvironmentHelpers.cs b/Sustainsys.Saml2.Metadata/Helpers/EnvironmentHelpers.cs
@@ -7,13 +7,13 @@ internal class EnvironmentHelpers
     {
         public static bool IsNetCore =>
 #if NETSTANDARD2_0
-            RuntimeInformation.FrameworkDescription.
-            StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase);
-
+        // To support .NET 5.0 and up, specifically check if this is not .NET Framework.
+        // Since .NET 5.0, the description no longer starts with ".NET Core", but simply ".NET". 
+        !RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
 #else
-        // If not netstandard, then it is one of the .NET Framework targets. And
+        // If not netstandard, then it is one of the .NET Framework targets. And 
         // obviously not running on core.
         false;
 #endif
     }
-}
+}
diff --git a/Sustainsys.Saml2/Internal/EnvironmentHelpers.cs b/Sustainsys.Saml2/Internal/EnvironmentHelpers.cs
@@ -4,11 +4,12 @@
 namespace Sustainsys.Saml2.Internal
 {
 	public class EnvironmentHelpers
-    {
-		public static bool IsNetCore =>
+    {
+        public static bool IsNetCore =>
 #if NETSTANDARD2_0
-            RuntimeInformation.FrameworkDescription.
-			StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase);
+        // To support .NET 5.0 and up, specifically check if this is not .NET Framework.
+        // Since .NET 5.0, the description no longer starts with ".NET Core", but simply ".NET". 
+        !RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
 #else
         // If not netstandard, then it is one of the .NET Framework targets. And 
         // obviously not running on core.