Skip to content

[Xamarin.Android.Build.Tasks] Fix _CreateAar race under parallel build #11527

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

Draft
jonathanpeppers wants to merge 4 commits into
base: main
Choose a base branch
from
+24 −1
Draft

[Xamarin.Android.Build.Tasks] Fix _CreateAar race under parallel build #11527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
427857f
[Xamarin.Android.Build.Tasks] Fix _CreateAar race under parallel build
jonathanpeppers May 28, 2026
3c9b3fb
[Xamarin.Android.Build.Tasks] Dedup JarFiles in CreateAar
jonathanpeppers May 28, 2026
f5e38e6
Revert "[Xamarin.Android.Build.Tasks] Dedup JarFiles in CreateAar"
jonathanpeppers May 28, 2026
a20b8a4
[Xamarin.Android.Build.Tasks] Make _IncludeAarInNuGetPackage depend o…
jonathanpeppers May 28, 2026
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 ...ndroid.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ properties that determine build ordering.
_CheckForDeletedResourceFile;
_ComputeAndroidResourcePaths;
_UpdateAndroidResgen;
_CreateAar;
</_UpdateAndroidResourcesDependsOn>
<CompileDependsOn>
_SetupMSBuildAllProjects;
Expand Down Expand Up @@ -246,6 +245,7 @@ properties that determine build ordering.
<_IncludeAarInNuGetPackageDependsOn>
_BuildAndroidGradleProjects;
_CategorizeAndroidLibraries;
_CreateAar;
</_IncludeAarInNuGetPackageDependsOn>
</PropertyGroup>

Expand Down
23 changes: 23 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,29 @@ public void LibraryProjectTargetsDoNotBreak ([Values] AndroidRuntime runtime)
}
}

[Test]
public void CreateAarRunsOnceWithGeneratePackageOnBuild ()
{
// https://github.com/dotnet/android/issues/11514
// `_CreateAar` was being invoked twice for a single library build when
// `GeneratePackageOnBuild=true`: once via `BuildDependsOn`, and again via
// NuGet pack's per-TFM dispatch which entered the project at
// `_GetFrameworkAssemblyReferences`. That target transitively pulled in
// `UpdateAndroidResources` -> `_UpdateAndroidResources` -> `_CreateAar`
// via `_UpdateAndroidResourcesDependsOn`. The second invocation can race
// the first writer when parallel builds (-m) consumers concurrently read
// the .aar via `Files.HashFile`, producing `XARLP7024`.
var proj = new XamarinAndroidLibraryProject ();
proj.SetProperty ("GeneratePackageOnBuild", "true");
using (var b = CreateDllBuilder ()) {
b.Verbosity = LoggerVerbosity.Detailed;
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
int count = b.LastBuildOutput.Count (l => l.Contains ("Target \"_CreateAar\" in file"));
Assert.AreEqual (1, count,
$"`_CreateAar` should only execute once per build of a library project; was {count}.");
}
}

[Test]
public void ManifestMergerIncremental ([Values] AndroidRuntime runtime)
{
Expand Down