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

MSLukeWest · web-flow · commit 8a971d94a3fa · 2023-09-19T16:11:58.000-07:00
Update OpenJDK location for OpenJDK17 on windows
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);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ class MicrosoftOpenJdkLocations : JdkLocations {`
`12`	`12`	`internal static IEnumerable<JdkInfo> GetMicrosoftOpenJdks (Action<TraceLevel, string> logger)`
`13`	`13`	`{`
`14`	`14`	`return GetMacOSSystemJdks ("microsoft-*.jdk", logger)`
	`15`	`+ .Concat (GetWindowsFileSystemJdks (Path.Combine ("Android", "openjdk", "jdk-*"), logger))`
`15`	`16`	`.Concat (GetWindowsFileSystemJdks (Path.Combine ("Microsoft", "jdk-*"), logger))`
`16`	`17`	`.Concat (GetWindowsRegistryJdks (logger, @"SOFTWARE\Microsoft\JDK", "*", @"hotspot\MSI", "Path"))`
`17`	`18`	`.OrderByDescending (jdk => jdk, JdkInfoVersionComparer.Default);`