Skip to content

[Xamarin.Android.Tools.AndroidSdk] More Microsoft Dist JDK Support #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Aug 11, 2021
Merged

[Xamarin.Android.Tools.AndroidSdk] More Microsoft Dist JDK Support #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public static void DetectAndSetPreferredJavaSdkPathToLatest (Action<TraceLevel,

logger = logger ?? DefaultConsoleLogger;

var latestJdk = MicrosoftOpenJdkLocations.GetMicrosoftOpenJdks (logger).FirstOrDefault ();
var latestJdk = JdkInfo.GetPreferredJdkInfos (logger).FirstOrDefault ();
if (latestJdk == null)
throw new NotSupportedException ("No Microsoft OpenJDK could be found. Please re-run the Visual Studio installer or manually specify the JDK path in settings.");

Expand Down
9 changes: 9 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ static Dictionary<string, List<string>> GetJavaProperties (string java)
return props;
}

// Keep ordering in sync w/ GetPreferredJdkInfos
public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, string>? logger = null)
{
logger = logger ?? AndroidSdkInfo.DefaultConsoleLogger;
Expand All @@ -300,6 +301,14 @@ public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, st
;
}

// Keep ordering in sync w/ GetKnownSystemJdkInfos
internal static IEnumerable<JdkInfo> GetPreferredJdkInfos (Action<TraceLevel, string> logger)
{
return MicrosoftOpenJdkLocations.GetMicrosoftOpenJdks (logger)
.Concat (MicrosoftDistJdkLocations.GetMicrosoftDistJdks (logger))
;
}

internal static JdkInfo? TryGetJdkInfo (string path, Action<TraceLevel, string> logger, string locator)
{
JdkInfo? jdk = null;
Expand Down