Identify macOS runtimes correctly

edvilme · edvilme · commit 6c70385cec43 · 2025-01-27T11:39:48.000-08:00
diff --git a/src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs b/src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text.Json;
 using Microsoft.DotNet.Tools.Uninstall.Shared.BundleInfo;
 using Microsoft.DotNet.Tools.Uninstall.Shared.BundleInfo.Versioning;
 using Microsoft.DotNet.Tools.Uninstall.Shared.Configs;
@@ -46,12 +47,22 @@ public virtual IEnumerable<Bundle> GetAllInstalledBundles()
             return [..sdks, ..runtimes];
         }
 
-        private static bool IsMacx64Installation(string sdkVersionPath)
+        private static bool IsMacx64Installation(string bundlePath, bool isSdk)
         {
             try
             {
-                var rids = File.ReadAllText(Path.Combine(sdkVersionPath, "NETCoreSdkRuntimeIdentifierChain.txt"));
-                return !rids.Contains("osx-arm64");
+                if (isSdk)
+                {
+                    var rids = File.ReadAllText(Path.Combine(bundlePath, "NETCoreSdkRuntimeIdentifierChain.txt"));
+                    return !rids.Contains("osx-arm64");
+                }
+                else
+                {
+                    var depsJsonFile = Directory.EnumerateFiles(bundlePath, "Microsoft.*.deps.json", SearchOption.TopDirectoryOnly).FirstOrDefault();
+                    var targets = JsonSerializer.Deserialize<Dictionary<string, object>>(File.ReadAllText(depsJsonFile));
+                    var runtimeTarget = (JsonElement)targets["runtimeTarget"];
+                    return !runtimeTarget.GetProperty("name").ToString().Contains("osx-arm64");
+                }
             }
             catch
             {
@@ -89,7 +100,7 @@ private static IEnumerable<Bundle> GetInstalledBundles<TBundleVersion>(params st
                     .Select(dirInfo =>
                     {
                         var success = BundleVersion.TryFromInput<TBundleVersion>(dirInfo.Name, out var version);
-                        var arch = IsMacx64Installation(dirInfo.FullName) ? BundleArch.X64 : BundleArch.Arm64;
+                        var arch = IsMacx64Installation(dirInfo.FullName, version is SdkVersion) ? BundleArch.X64 : BundleArch.Arm64;
                         return (Success: success, Version: version, Path: dirInfo.FullName, Arch: arch);
                     })
                     .Where(tuple => tuple.Success)
diff --git a/src/dotnet-core-uninstall/Windows/RegistryQuery.cs b/src/dotnet-core-uninstall/Windows/RegistryQuery.cs
@@ -82,10 +82,10 @@ internal static bool IsNetCoreBundle(string displayName, string displayVersion,
                      (displayName.IndexOf("Dotnet Shared Framework for Windows Desktop", StringComparison.OrdinalIgnoreCase) >= 0) ||
                      (displayName.IndexOf("Windows Desktop Runtime", StringComparison.OrdinalIgnoreCase) >= 0)) &&
                     (!String.IsNullOrEmpty(uninstallString)) &&
-                    (uninstallString.IndexOf(".exe", StringComparison.OrdinalIgnoreCase) >= 0) &&
+                    // (uninstallString.IndexOf(".exe", StringComparison.OrdinalIgnoreCase) >= 0) &&
                     (uninstallString.IndexOf("msiexec", StringComparison.OrdinalIgnoreCase) < 0) &&
-                    (!String.IsNullOrEmpty(displayVersion)) &&
-                    (!String.IsNullOrEmpty(bundleVersion));
+                    (!String.IsNullOrEmpty(displayVersion)) && true;
+                    // (!String.IsNullOrEmpty(bundleVersion));
         }
 
         private static Bundle WrapRegistryKey(RegistryKey registryKey)
