Skip to content

Add _AndroidLibraryProjectImportsCache to FileWrites #7780

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
merged 2 commits into from
Feb 15, 2023
Merged

Add _AndroidLibraryProjectImportsCache to FileWrites #7780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
255fe2b
Add `_AndroidLibraryProjectImportsCache` to `FileWrites`
dellis1972 Feb 8, 2023
d681850
Add Unit Test
dellis1972 Feb 14, 2023
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: 3 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 @@ -857,6 +857,7 @@ public void ResolveLibraryProjectImports ([Values (true, false)] bool useAapt2)

b.BuildLogFile = "build2.log";
Assert.IsTrue (b.Build (proj), "second build should have succeeded.");
FileAssert.Exists (cacheFile);
var actual = ReadCache (cacheFile);
CollectionAssert.AreEqual (actual.Jars.Select (j => j.ItemSpec),
expected.Jars.Select (j => j.ItemSpec));
Expand All @@ -871,6 +872,7 @@ public void ResolveLibraryProjectImports ([Values (true, false)] bool useAapt2)

b.BuildLogFile = "build3.log";
Assert.IsTrue (b.Build (proj), "third build should have succeeded.");
FileAssert.Exists (cacheFile);
actual = ReadCache (cacheFile);
Assert.AreEqual (expected.Jars.Length + 1, actual.Jars.Length,
$"{nameof (expected.Jars)} should have one more item");
Expand All @@ -885,6 +887,7 @@ public void ResolveLibraryProjectImports ([Values (true, false)] bool useAapt2)
// Build with no changes, checking we are skipping targets appropriately
b.BuildLogFile = "build4.log";
Assert.IsTrue (b.Build (proj), "fourth build should have succeeded.");
FileAssert.Exists (cacheFile);
var targets = new List<string> {
"_UpdateAndroidResgen",
"_CompileJava",
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.EmbeddedResource.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ This file is used by all project types, including binding projects.
OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
/>
<Touch Files="$(_AndroidStampDirectory)_ResolveLibraryProjectImports.stamp" AlwaysCreate="true" />
<ItemGroup>
<FileWrites Include="$(_AndroidLibraryProjectImportsCache)"
Condition="Exists ('$(_AndroidLibraryProjectImportsCache)')"/>
</ItemGroup>
</Target>

<Target Name="_ExtractLibraryProjectImports" DependsOnTargets="_ResolveLibraryProjectImports">
Expand Down