Resolve and refresh Android command-line tools by installed Pkg.Revision#12154
Open
rmarinho wants to merge 2 commits into
Open
Resolve and refresh Android command-line tools by installed Pkg.Revision#12154rmarinho wants to merge 2 commits into
rmarinho wants to merge 2 commits into
Conversation
Unify command-line tool discovery around Pkg.Revision and add a conditional cmdline-tools;latest refresh path. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 189aca0e-61f3-48f5-8a5c-aa9a6fdd7f9b
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates Xamarin.Android.Tools.AndroidSdk command-line tool discovery to be Pkg.Revision-aware, so sdkmanager/avdmanager selection is based on the highest installed revision (from source.properties) rather than directory name precedence, and adds an “ensure latest” workflow for conditional refresh.
Changes:
- Added a shared
CommandLineToolsResolver+ new publicSdkManager.FindSdkManager()/EnsureLatestCommandLineToolsAsync()APIs to select and refresh command-line tools by installedPkg.Revision. - Updated
ProcessUtils.FindCmdlineTool()andSdkManager.FindSdkManagerPath()to use the shared resolver (consistent selection across tools). - Improved
sdkmanager --listparsing to include “Available Updates”, and added test coverage for precedence/fallbacks, prereleases, refresh, cancellation, and progress.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| external/xamarin-android-tools/tests/Xamarin.Android.Tools.AndroidSdk-Tests/SdkManagerTests.cs | Updates list-parsing test to validate inclusion of “Available Updates”. |
| external/xamarin-android-tools/tests/Xamarin.Android.Tools.AndroidSdk-Tests/CommandLineToolsResolverTests.cs | Adds coverage for revision-based selection, prerelease ordering, legacy fallback, and refresh behavior. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/SdkManager.Packages.cs | Extends sdkmanager --list parsing to include updates in the available set. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/SdkManager.CommandLineTools.cs | Introduces revision-aware sdkmanager discovery and conditional install of cmdline-tools;latest. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs | Routes cmdline-tool discovery through the new resolver. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Models/Sdk/SdkBootstrapProgress.cs | Updates progress summary to cover refresh operations. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Models/Sdk/SdkBootstrapPhase.cs | Adds phases for update checking and installation. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Models/Sdk/CommandLineTool.cs | Adds a public model for resolved tool path + revision. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/CommandLineToolsResolver.cs | Implements Pkg.Revision-aware resolution with deterministic fallback behavior. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt | Declares newly introduced public APIs and enum members for netstandard2.0. |
| external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/PublicAPI/net10.0/PublicAPI.Unshipped.txt | Declares newly introduced public APIs and enum members for net10.0. |
Validate resolved tool paths and preserve disposal checks in the injectable ensure path. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 189aca0e-61f3-48f5-8a5c-aa9a6fdd7f9b
Comment on lines
+38
to
+40
| var legacyPath = Path.Combine (sdkPath, "tools", "bin", toolName + extension); | ||
| if (!File.Exists (legacyPath)) | ||
| return null; |
Member
There was a problem hiding this comment.
I would just remove this for any new code -- no one should be using tools only cmdline-tools.
Comment on lines
+71
to
+75
| var normalizedVersion = new Version ( | ||
| parsedVersion.Major, | ||
| Math.Max (parsedVersion.Minor, 0), | ||
| Math.Max (parsedVersion.Build, 0), | ||
| Math.Max (parsedVersion.Revision, 0)); |
Member
There was a problem hiding this comment.
Why does this put 0's for all the components? It seems like we could just use what Version.TryParse() returns.
The reason this would be weird, is all the existing command-line tools versions only have two components like X.Y.
Comment on lines
+139
to
+141
| var sourceProperties = Path.Combine (directory, "source.properties"); | ||
| if (!File.Exists (sourceProperties)) | ||
| return false; |
Member
There was a problem hiding this comment.
source.properties is a common thing for all Android SDK components. Is this the first case we are parsing it? Or should we be reusing existing code.
If this is net-new code, should we put it in an internal utility class if we might use it elsewhere in the future?
Comment on lines
+1
to
+2
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. |
Member
There was a problem hiding this comment.
We don't have to put these, do we know why the AI is doing it?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
sdkmanager,avdmanager, and future command-line tools through one sharedPkg.Revision-aware resolvercmdline-tools;latestwhen the installed manager is missing or staletools/bin/sdkmanagercompatibility, parse available SDK updates correctly, and add coverage for precedence, fallbacks, prereleases, refresh, cancellation, and progressTesting
dotnet test external/xamarin-android-tools/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj -c Release --no-restore --filter "FullyQualifiedName~CommandLineToolsResolverTests|FullyQualifiedName~SdkManagerTests"dotnet build external/xamarin-android-tools/Xamarin.Android.Tools.sln -c Release --no-restoreFixes #12137