GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'GoaLitiuM-dotnet_windows_detect_fix'

Browse Source
This commit is contained in:
Wojtek Figat
2025-11-13 22:05:47 +01:00
parent 91ee9f5e05 3563287f17
commit 13e31650be
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
View File

@@ -217,9 +217,17 @@ namespace Flax.Build
using RegistryKey sdkVersionsKey = baseKey.OpenSubKey($@"SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\{arch}\sdk");
using RegistryKey runtimeKey = baseKey.OpenSubKey(@$"SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\{arch}\sharedfx\Microsoft.NETCore.App");
using RegistryKey hostKey = baseKey.OpenSubKey(@$"SOFTWARE\dotnet\Setup\InstalledVersions\{arch}\sharedhost");
dotnetPath = (string)hostKey.GetValue("Path");
dotnetPath = (string)hostKey?.GetValue("Path");
dotnetSdkVersions = sdkVersionsKey?.GetValueNames() ?? Enumerable.Empty<string>();
dotnetRuntimeVersions = runtimeKey?.GetValueNames() ?? Enumerable.Empty<string>();
if (string.IsNullOrEmpty(dotnetPath))
{
// The sharedhost registry key seems to be deprecated, assume the default installation location instead
var defaultPath = Path.Combine(Path.GetPathRoot(Environment.SystemDirectory), "Program Files", "dotnet");
if (File.Exists(Path.Combine(defaultPath, "dotnet.exe")))
dotnetPath = defaultPath;
}
}
#pragma warning restore CA1416
break;