fix the runtime check for msbuild testing

Author: arturcic

src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

@@ -20,6 +20,7 @@
     <ItemGroup>
         <Compile Include="..\GitVersionCore.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />
         <Compile Include="..\GitVersionCore.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs" />
+        <Compile Include="..\GitVersionCore.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs" />
         <Compile Include="..\GitVersionCore.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs" />
         <Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
         <Compile Include="..\GitVersionCore.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs" />

src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs

@@ -5,10 +5,10 @@
 using Buildalyzer.Environment;
 using GitTools.Testing;
 using GitVersionCore.Tests;
+using GitVersionCore.Tests.Helpers;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Logging;
 using Microsoft.Build.Utilities.ProjectCreation;
-using NUnit.Framework.Internal;
 using StringWriter = System.IO.StringWriter;
 
 namespace GitVersion.MsBuild.Tests.Helpers
@@ -69,12 +69,9 @@ public MsBuildExeFixtureResult Execute()
 
         public void CreateTestProject(Action<ProjectCreator> extendProject)
         {
-            var project = RuntimeFramework.CurrentFramework.Runtime switch
-            {
-                RuntimeType.NetCore => ProjectCreator.Templates.SdkCsproj(ProjectPath),
-                RuntimeType.Net => ProjectCreator.Templates.LegacyCsproj(ProjectPath, defaultTargets: null, targetFrameworkVersion: "v4.8", toolsVersion: "15.0"),
-                _ => null
-            };
+            var project = RuntimeHelper.IsCoreClr()
+                ? ProjectCreator.Templates.SdkCsproj(ProjectPath)
+                : ProjectCreator.Templates.LegacyCsproj(ProjectPath, defaultTargets: null, targetFrameworkVersion: "v4.8", toolsVersion: "15.0");
 
             if (project == null) return;
 

src/GitVersionCore.Tests/Helpers/PathHelper.cs

@@ -13,19 +13,15 @@ public static string GetCurrentDirectory()
 
         public static string GetExecutable()
         {
-#if NETFRAMEWORK
-            var executable = Path.Combine(GetExeDirectory(), "gitversion.exe");
-#else
-            var executable = "dotnet";
-#endif
-            return executable;
+            return RuntimeHelper.IsCoreClr() ? "dotnet" : Path.Combine(GetExeDirectory(), "gitversion.exe");
         }
 
         public static string GetExecutableArgs(string args)
         {
-#if !NETFRAMEWORK
-            args = $"{Path.Combine(GetExeDirectory(), "gitversion.dll")} {args}";
-#endif
+            if (RuntimeHelper.IsCoreClr())
+            {
+                args = $"{Path.Combine(GetExeDirectory(), "gitversion.dll")} {args}";
+            }
             return args;
         }
 

src/GitVersionCore.Tests/Helpers/RuntimeHelper.cs

@@ -0,0 +1,20 @@
+namespace GitVersionCore.Tests.Helpers
+{
+    public static class RuntimeHelper
+    {
+#if !NETFRAMEWORK
+        private static bool? _isCoreClr;
+#endif
+
+        public static bool IsCoreClr()
+        {
+#if !NETFRAMEWORK
+            _isCoreClr ??= System.Environment.Version.Major >= 5
+                           || System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
+            return _isCoreClr.Value;
+#else
+            return false;
+#endif
+        }
+    }
+}

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -21,6 +21,7 @@
     <ItemGroup>
       <Compile Include="..\GitVersionCore.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />
       <Compile Include="..\GitVersionCore.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs" />
+      <Compile Include="..\GitVersionCore.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs" />
       <Compile Include="..\GitVersionCore.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs" />
       <Compile Include="..\GitVersionCore.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
       <Compile Include="..\GitVersionCore.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />