Merge pull request #1304 from nunit/issue-1300

Use x86 dotnet install path when running an x86 test assembly
nunit · Jan 11, 2023 · 76330ac · 76330ac
2 parents abc8668 + 477990c
commit 76330ac
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs b/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs
@@ -97,7 +97,9 @@ private static string GetDotNetInstallDirectory()
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 // Running on Windows so use registry
-                RegistryKey key = Registry.LocalMachine.OpenSubKey(@"Software\dotnet\SetUp\InstalledVersions\x64\sharedHost\");
+                RegistryKey key = Environment.Is64BitProcess
+                    ? Registry.LocalMachine.OpenSubKey(@"Software\dotnet\SetUp\InstalledVersions\x64\sharedHost\")
+                    : Registry.LocalMachine.OpenSubKey(@"Software\dotnet\SetUp\InstalledVersions\x86\sharedHost\");
                 return (string)key?.GetValue("Path");
             }
             else