Skip to content

[release/10.0.1xx] [Xamarin.Android.Build.Tasks] Fix _CreateAar race under parallel build #11570

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

Open
jonathanpeppers wants to merge 1 commit into
base: release/10.0.1xx
Choose a base branch
from
+28 −1
Open

[release/10.0.1xx] [Xamarin.Android.Build.Tasks] Fix _CreateAar race under parallel build #11570

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 ...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 @@ -174,7 +174,6 @@ properties that determine build ordering.
_CheckForDeletedResourceFile;
_ComputeAndroidResourcePaths;
_UpdateAndroidResgen;
_CreateAar;
</_UpdateAndroidResourcesDependsOn>
<CompileDependsOn>
_SetupMSBuildAllProjects;
Expand Down Expand Up @@ -244,6 +243,7 @@ properties that determine build ordering.
<_IncludeAarInNuGetPackageDependsOn>
_BuildAndroidGradleProjects;
_CategorizeAndroidLibraries;
_CreateAar;
</_IncludeAarInNuGetPackageDependsOn>
</PropertyGroup>

Expand Down
27 changes: 27 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 @@ -522,6 +522,33 @@ public void LibraryProjectTargetsDoNotBreak ()
}
}

[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.");
// MSBuild emits "Building target X completely" only when the target
// actually runs (not when it is entered then skipped due to empty
// Inputs/Outputs). Counting that message gives us the number of real
// `_CreateAar` executions, which is what races on disk in #11514.
int count = b.LastBuildOutput.Count (l => l.Contains ("Building target \"_CreateAar\""));
Assert.AreEqual (1, count,
$"`_CreateAar` should only execute once per build of a library project; was {count}.");
}
}

[Test]
public void ManifestMergerIncremental ()
{
Expand Down