Port issue 1381 to V4

nunit · Dec 28, 2024 · e067c46 · e067c46
1 parent 6be9b12
commit e067c46
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 46 deletions.
diff --git a/src/NUnitEngine/nunit.engine.core/DotNet.cs b/src/NUnitEngine/nunit.engine.core/DotNet.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
+
+using Microsoft.Win32;
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace NUnit.Engine
+{
+    public static class DotNet
+    {
+        public static string GetInstallDirectory() => Environment.Is64BitProcess
+            ? GetX64InstallDirectory() : GetX86InstallDirectory();
+
+        public static string GetInstallDirectory(bool x86) => x86
+            ? GetX86InstallDirectory() : GetX64InstallDirectory();
+
+        private static string _x64InstallDirectory;
+        public static string GetX64InstallDirectory()
+        {
+            if (_x64InstallDirectory == null)
+                _x64InstallDirectory = Environment.GetEnvironmentVariable("DOTNET_ROOT");
+
+            if (_x64InstallDirectory == null)
+            {
+#if NETFRAMEWORK
+                if (Path.DirectorySeparatorChar == '\\')
+#else
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+#endif
+                {
+                    RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\dotnet\SetUp\InstalledVersions\x64\sharedHost\");
+                    _x64InstallDirectory = (string)key?.GetValue("Path");
+                }
+                else
+                    _x64InstallDirectory = "/usr/shared/dotnet/";
+            }
+
+            return _x64InstallDirectory;
+        }
+
+        private static string _x86InstallDirectory;
+        public static string GetX86InstallDirectory()
+        {
+            if (_x86InstallDirectory == null)
+                _x86InstallDirectory = Environment.GetEnvironmentVariable("DOTNET_ROOT_X86");
+
+            if (_x86InstallDirectory == null)
+            {
+#if NETFRAMEWORK
+                if (Path.DirectorySeparatorChar == '\\')
+#else
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+#endif
+                {
+                    RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\dotnet\SetUp\InstalledVersions\x86\");
+                    _x86InstallDirectory = (string)key?.GetValue("InstallLocation");
+                }
+                else
+                    _x86InstallDirectory = "/usr/shared/dotnet/";
+            }
+
+            return _x86InstallDirectory;
+        }
+    }
+}
diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs b/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs
@@ -30,7 +30,7 @@ internal sealed class TestAssemblyResolver : IDisposable
 
         static TestAssemblyResolver()
         {
-            INSTALL_DIR = GetDotNetInstallDirectory();
+            INSTALL_DIR = DotNet.GetInstallDirectory();
             WINDOWS_DESKTOP_DIR = Path.Combine(INSTALL_DIR, "shared", "Microsoft.WindowsDesktop.App");
             ASP_NET_CORE_DIR = Path.Combine(INSTALL_DIR, "shared", "Microsoft.AspNetCore.App");
 
@@ -168,27 +168,6 @@ private static bool TryLoadFromTrustedPlatformAssemblies(AssemblyLoadContext con
             return false;
         }
 
-        private static string GetDotNetInstallDirectory()
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                if (Environment.Is64BitProcess)
-                {
-                    RegistryKey key =
-                        Registry.LocalMachine.OpenSubKey(@"Software\dotnet\SetUp\InstalledVersions\x64\sharedHost\");
-                    return (string)key?.GetValue("Path");
-                }
-                else
-                {
-                    RegistryKey key =
-                        Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\dotnet\SetUp\InstalledVersions\x86\");
-                    return (string)key?.GetValue("InstallLocation");
-                }
-            }
-            else // For now, we assume linux with a fixed path
-                return "/usr/shared/dotnet/";
-        }
-
         private static string FindBestVersionDir(string libraryDir, Version targetVersion)
         {
             string target = targetVersion.ToString();

diff --git a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs
@@ -73,7 +73,7 @@ public AgentProcess(TestAgency agency, TestPackage package, Guid agentId)
                     if (Path.DirectorySeparatorChar != '\\')
                         throw new Exception("Running .NET Core as X86 is currently only supported on Windows");
 
-                    var x86_dotnet_exe = @"C:\Program Files (x86)\dotnet\dotnet.exe";
+                    var x86_dotnet_exe = Path.Combine(DotNet.GetX86InstallDirectory(), "dotnet.exe");
                     if (!File.Exists(x86_dotnet_exe))
                         throw new Exception("The X86 version of dotnet.exe is not installed");
 

diff --git a/src/NUnitEngine/nunit.engine/Services/RuntimeLocators/NetCoreRuntimeLocator.cs b/src/NUnitEngine/nunit.engine/Services/RuntimeLocators/NetCoreRuntimeLocator.cs
@@ -36,9 +36,9 @@ public static IEnumerable<RuntimeFramework> FindRuntimes(bool forX86)
             }
         }
 
-        private static IEnumerable<string> GetRuntimeDirectories(bool isX86)
+        private static IEnumerable<string> GetRuntimeDirectories(bool x86)
         {
-            string installDir = GetDotNetInstallDirectory(isX86);
+            string installDir = DotNet.GetInstallDirectory(x86);
 
             if (installDir != null && Directory.Exists(installDir) &&
                 File.Exists(Path.Combine(installDir, "dotnet.exe")))
@@ -110,27 +110,6 @@ private static bool TryGetVersionFromString(string text, out Version newVersion)
                 return false;
             }
         }
-
-        internal static string GetDotNetInstallDirectory(bool isX86)
-        {
-            if (Path.DirectorySeparatorChar == '\\')
-            {
-                if (isX86)
-                {
-                    RegistryKey key =
-                        Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\dotnet\SetUp\InstalledVersions\x86\");
-                    return (string)key?.GetValue("InstallLocation");
-                }
-                else
-                {
-                    RegistryKey key =
-                        Registry.LocalMachine.OpenSubKey(@"Software\dotnet\SetUp\InstalledVersions\x64\sharedHost\");
-                    return (string)key?.GetValue("Path");
-                }
-            }
-            else
-                return "/usr/shared/dotnet/";
-        }
     }
 }
 #endif