Merge pull request #217 from xamarin/dev/tondat/main-openjdkms

Update OpenJDK location for OpenJDK17 on windows
dotnet · Sep 19, 2023 · 8a971d9 · 8a971d9
2 parents 9c50a2d + 42bbef8
commit 8a971d9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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<JdkInfo> GetMicrosoftOpenJdks (Action<TraceLevel, string> 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);