BUGFIX: Do not include 'shared' in default UNIX dotnet installation p…

…aths. Add default macOS dotnet installation folder.
Washi1337 · Apr 9, 2022 · fb3516a · fb3516a
1 parent 788c6b3
commit fb3516a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/AsmResolver.DotNet/DotNetCorePathProvider.cs b/src/AsmResolver.DotNet/DotNetCorePathProvider.cs
@@ -13,8 +13,9 @@ namespace AsmResolver.DotNet
     public class DotNetCorePathProvider
     {
         private static readonly string[] DefaultDotNetUnixPaths = {
-            "/usr/share/dotnet/shared",
-            "/opt/dotnet/shared/"
+            "/usr/share/dotnet/",
+            "/usr/local/share/dotnet/",
+            "/opt/dotnet/"
         };
 
         private static readonly Regex NetCoreRuntimePattern = new(@"\.NET( Core)? \d+\.\d+\.\d+");
@@ -23,7 +24,7 @@ public class DotNetCorePathProvider
         static DotNetCorePathProvider()
         {
             DefaultInstallationPath = FindDotNetPath();
-            Default = new();
+            Default = new DotNetCorePathProvider();
         }
 
         /// <summary>
@@ -153,8 +154,12 @@ public bool HasRuntimeInstalled(string runtimeName, Version runtimeVersion)
         private void DetectInstalledRuntimes(string installationDirectory)
         {
             installationDirectory = Path.Combine(installationDirectory, "shared");
+            if (!Directory.Exists(installationDirectory))
+                return;
+
             foreach (string directory in Directory.EnumerateDirectories(installationDirectory))
                 _installedRuntimes.Add(new DotNetInstallationInfo(directory));
+
             _installedRuntimes.Sort();
         }