Merge branch 'devlead-feature/gh-2859' into hotfix/0.38.5

cake-build · Sep 20, 2020 · 78d3426 · 78d3426
2 parents 439ac27 + b0fce2b
commit 78d3426
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Cake.Core/Polyfill/EnvironmentHelper.cs b/src/Cake.Core/Polyfill/EnvironmentHelper.cs
@@ -92,7 +92,8 @@ public static bool IsCoreClr()
 #if NETCORE
             if (_isCoreClr == null)
             {
-                _isCoreClr = RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
+                _isCoreClr = RuntimeInformation.FrameworkDescription.StartsWith(".NET Core")
+                                || RuntimeInformation.FrameworkDescription.StartsWith(".NET 5");
             }
             return _isCoreClr.Value;
 #else

diff --git a/src/Cake.Core/Polyfill/Runtime.cs b/src/Cake.Core/Polyfill/Runtime.cs
@@ -11,7 +11,7 @@ public enum Runtime
         Clr,
 
         /// <summary>
-        /// .NET Core 2.
+        /// .NET Core / .NET 5.
         /// </summary>
         CoreClr
     }