From 8731a299c8b17e50ec8abcf22f45dace23e51567 Mon Sep 17 00:00:00 2001 From: Pedro Jesus Date: Mon, 3 Oct 2022 14:41:01 -0300 Subject: [PATCH] fix: make sure to search for correct arm version --- UnoCheck/Checkups/AndroidEmulatorCheckup.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UnoCheck/Checkups/AndroidEmulatorCheckup.cs b/UnoCheck/Checkups/AndroidEmulatorCheckup.cs index 1dbc5a83..99c07c8c 100644 --- a/UnoCheck/Checkups/AndroidEmulatorCheckup.cs +++ b/UnoCheck/Checkups/AndroidEmulatorCheckup.cs @@ -14,6 +14,7 @@ namespace DotNetCheck.Checkups { public class AndroidEmulatorCheckup : Checkup { + const string armArch = "arm64-v8a"; public override IEnumerable DeclareDependencies(IEnumerable checkupIds) => new [] { new CheckupDependency("androidsdk") }; @@ -120,7 +121,12 @@ public override Task Examine(SharedState history) // and will install the wrong emulator (x86_64) // https://github.com/dotnet/runtime/issues/42130 return Util.IsArm64 - ? p.Path.Contains("arm", StringComparison.OrdinalIgnoreCase) + + // The Path will be something like: + // system-images;android-33;google_apis;arm64-v8a (for arm) + // system-images;android-31;google_apis;x86_64 (for x86 or x64) + + ? p.Path.Contains(armArch, StringComparison.OrdinalIgnoreCase) : p.Path.Equals(me.SdkId, StringComparison.OrdinalIgnoreCase); }); if (sdkPackage == null && (me.AlternateSdkIds?.Any() ?? false))