From 42bbef854b910e5089fdd230e97aceb2a515c53d Mon Sep 17 00:00:00 2001 From: Juan Marcelo Tondato Date: Tue, 19 Sep 2023 20:07:17 -0300 Subject: [PATCH] Update OpenJDK location for OpenJDK17 on windows - VS installer start using a zip payload to install the OpenJDK on %programFiles%/Android/openjdk/jdk-* --- .../Jdks/MicrosoftOpenJdkLocations.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Jdks/MicrosoftOpenJdkLocations.cs b/src/Xamarin.Android.Tools.AndroidSdk/Jdks/MicrosoftOpenJdkLocations.cs index 9274eb6..157cbd5 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Jdks/MicrosoftOpenJdkLocations.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/Jdks/MicrosoftOpenJdkLocations.cs @@ -12,6 +12,7 @@ class MicrosoftOpenJdkLocations : JdkLocations { internal static IEnumerable GetMicrosoftOpenJdks (Action logger) { return GetMacOSSystemJdks ("microsoft-*.jdk", logger) + .Concat (GetWindowsFileSystemJdks (Path.Combine ("Android", "openjdk", "jdk-*"), logger)) .Concat (GetWindowsFileSystemJdks (Path.Combine ("Microsoft", "jdk-*"), logger)) .Concat (GetWindowsRegistryJdks (logger, @"SOFTWARE\Microsoft\JDK", "*", @"hotspot\MSI", "Path")) .OrderByDescending (jdk => jdk, JdkInfoVersionComparer.Default);