Skip to content

[tests] Be more flexible when parsing build-tools versions #4354

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
Mar 4, 2020
Merged

[tests] Be more flexible when parsing build-tools versions #4354

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
3 changes: 2 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@ protected byte [] ReadAllBytesIgnoringLineEndings (Stream stream)
protected string GetPathToLatestBuildTools (string exe)
{
var path = Path.Combine (AndroidSdkPath, "build-tools");
foreach (var dir in Directory.GetDirectories (path, "*", SearchOption.TopDirectoryOnly).OrderByDescending (x => new Version (Path.GetFileName (x)))) {
foreach (var dir in Directory.GetDirectories (path, "*", SearchOption.TopDirectoryOnly).OrderByDescending (x => Path.GetFileName (x))) {
Copy link
Contributor

@jonpryor jonpryor Mar 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pity this will fails when sorting { "2", "10" }, because it sorts "stringly", not numerically.

Fortunately this is unlikely to be a problem now, because we're likely to always have two digit numbers. (But when we start hitting Build-tools 100, watch out!)

Unfortunately, this also sorts { "29.0.0-rc2", "29.0.0-rc1", "29.0.0" } in that order, such that the -rc2 will be preferred first, over the "stable" 29.0.0 version.

TestContext.Out.WriteLine ($"Found build tools version: {dir}.");
Copy link
Contributor

@jonpryor jonpryor Mar 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed!

https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=3522012&view=logs&jobId=cac0e8d3-0ef5-5d2b-b57e-e8fde7204df3&j=b9316caa-d7de-528c-89a6-5db86a60a380&t=ef74b103-60e3-58ea-4723-1595ac528a8c

Found build tools version: /Users/runner/Library/Android/sdk/build-tools/30.0.0-rc1.

var aapt2 = Path.Combine (dir, exe);
if (File.Exists (aapt2))
return dir;
Expand Down