Skip to content
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.

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

[Xamarin.Android.Build.Tasks] Fix Aar directory resolution. (#2424) #2556

Merged
merged 2 commits into from
Dec 20, 2018

Conversation

jonpryor
Copy link
Member

  • [Xamarin.Android.Build.Tasks] Fix Aar directory resolution.

Fixed #2408

As part of the speed up process when extracting resources
from assemblies and Aar files, we dont re-extract if
the stamp file is newer than the assembly.

The problem with that was in the case of Aar files we
were NOT adding the res or asset directories to
the list of resolved directories when we skipped extraction.
As a result we got less res directories on a second
build.

This commit fixes that.

  • Add Unit Test

  • Fix Compile Error

)

* [Xamarin.Android.Build.Tasks] Fix Aar directory resolution.

Fixed dotnet#2408

As part of the speed up process when extracting resources
from assemblies and Aar files, we dont re-extract if
the stamp file is newer than the assembly.

The problem with that was in the case of Aar files we
were NOT adding the `res` or `asset` directories to
the list of resolved directories when we skipped extraction.
As a result we got less `res` directories on a second
build.

This commit fixes that.

* Add Unit Test

* Fix Compile Error
@jonpryor
Copy link
Member Author

The failure:

Tasks/ResolveLibraryProjectImports.cs(336,10): error CS0103: The name 'SkipAndroidResourceProcessing' does not exist in the current context

The probable fix? Also cherry-pick 02c07ed? (...and any others?)

@jonathanpeppers: Thoughts?

Do we even want 02c07ed in d15-9?

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think 02c07ed is too risky to put in an SR.

I think we can get this one to work without it, though.

The usage of `ITaskItem` and item metadata isn't needed on d15-9
@jonpryor jonpryor merged commit 2cc615a into dotnet:d15-9 Dec 20, 2018
@github-actions github-actions bot locked and limited conversation to collaborators Feb 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants