From 4dcf083580f49d3ac98429ee35cb678c76743d15 Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Sun, 3 Apr 2022 12:37:53 +0100
Subject: [PATCH] Fix incorrect path used to find bundled x64 runtimes on Arm64

The wrong runtimes were resolved for dotnet x64 on Arm64 machines.
The FileSystemExplorer was using the dotnet Arm64 path
/usr/local/share/dotnet to find the x64 runtimes, instead of the
emulated dotnet install path.
---
 src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs b/src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs
index b7cff624..ae231871 100644
--- a/src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs
+++ b/src/dotnet-core-uninstall/MacOs/FileSystemExplorer.cs
@@ -40,10 +40,10 @@ public virtual IEnumerable<Bundle> GetAllInstalledBundles()
                 sdks = sdks.Concat(GetInstalledBundles<SdkVersion>(BundleArch.X64, DotNetSdkInstallPath(EmulatedDotNetInstallPath)));
                 runtimes = runtimes.Concat(GetInstalledBundles<RuntimeVersion>(
                     BundleArch.X64,
-                    DotNetRuntimeInstallPath(DotNetInstallPath),
-                    DotNetAspAllInstallPath(DotNetInstallPath),
-                    DotNetAspAppInstallPath(DotNetInstallPath),
-                    DotNetHostFxrInstallPath(DotNetInstallPath)));
+                    DotNetRuntimeInstallPath(EmulatedDotNetInstallPath),
+                    DotNetAspAllInstallPath(EmulatedDotNetInstallPath),
+                    DotNetAspAppInstallPath(EmulatedDotNetInstallPath),
+                    DotNetHostFxrInstallPath(EmulatedDotNetInstallPath)));
             }
 
             return sdks.Concat(runtimes).ToList();