Bump the manifestmerger-dependencies group in /src/manifestmerger with 2 updates - #12554
Merged
jonathanpeppers merged 1 commit intoAug 31, 2026
Conversation
Bumps the manifestmerger-dependencies group in /src/manifestmerger with 2 updates: com.android.tools.build:manifest-merger and com.android.tools:common. Updates `com.android.tools.build:manifest-merger` from 32.3.1 to 32.3.2 Updates `com.android.tools:common` from 32.3.1 to 32.3.2 --- updated-dependencies: - dependency-name: com.android.tools.build:manifest-merger dependency-version: 32.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: manifestmerger-dependencies - dependency-name: com.android.tools:common dependency-version: 32.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: manifestmerger-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
Bot
added
dependencies
dependabot
Bot
requested review from
jonathanpeppers and
simonrozsival
as code owners
August 28, 2026 02:52
dependabot
Bot
added
dependencies
Member
|
OK to merge. The failing |
jonathanpeppers
approved these changes
Aug 31, 2026
jonathanpeppers
deleted the
dependabot/gradle/src/manifestmerger/manifestmerger-dependencies-efbb7c8895
branch
August 31, 2026 14:02
jonathanpeppers
added a commit
that referenced
this pull request
Sep 1, 2026
## Description `DebuggingTasksTests.TestResolveToolsExists` invokes `ResolveXamarinAndroidTools` with temporary Android and Java SDK directories. On Windows, `AndroidSdkWindows.Initialize()` updates process-level `JAVA_HOME` and `PATH`, and `AndroidSdk.Refresh()` leaves shared SDK state pointing at the temporary fixtures. After those directories are deleted, later tests such as `PackagingTest.CheckSignApk(False,False,NativeAOT)` can launch Android tooling with the stale JDK path. Capture the real SDK paths and original process environment immediately before task execution. A focused `try`/`finally` around the two task calls restores `AndroidSdk`, `JAVA_HOME`, and `PATH`; the existing test setup and cache assertions remain otherwise unchanged. This is a standalone fix for the deterministic Windows CI contamination observed in PR #12554 build 1571801; it does not modify or depend on the Dependabot change. ## Testing - `dotnet-local.cmd build src\Xamarin.Android.Build.Tasks\Tests\Xamarin.Android.Build.Tests\Xamarin.Android.Build.Tests.csproj -v:quiet` - `dotnet-local.cmd test bin\TestDebug\net10.0\Xamarin.Android.Build.Tests.dll --filter "Name~TestResolveToolsExists" -v:quiet` Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
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
1 participant
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.
Bumps the manifestmerger-dependencies group in /src/manifestmerger with 2 updates: com.android.tools.build:manifest-merger and com.android.tools:common.
Updates
com.android.tools.build:manifest-mergerfrom 32.3.1 to 32.3.2Updates
com.android.tools:commonfrom 32.3.1 to 32.3.2Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore <dependency name> major versionwill close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)@dependabot ignore <dependency name> minor versionwill close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)@dependabot ignore <dependency name>will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)@dependabot unignore <dependency name>will remove all of the ignore conditions of the specified dependency@dependabot unignore <dependency name> <ignore condition>will remove the ignore condition of the specified dependency and ignore conditions