- Notifications
You must be signed in to change notification settings - Fork564
[Xamarin.Android.Build.Tasks] Fix Aar directory resolution.#2424
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
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
Fixeddotnet#2408As part of the speed up process when extracting resourcesfrom assemblies and Aar files, we dont re-extract ifthe stamp file is newer than the assembly.The problem with that was in the case of Aar files wewere NOT adding the `res` or `asset` directories tothe list of resolved directories when we skipped extraction.As a result we got less `res` directories on a secondbuild.This commit fixes that.
jonathanpeppers approved these changesNov 10, 2018
Member
jonathanpeppers left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I wonder how long it’s been like that... the new skipping item metadata looks right.
Contributor
jonpryor commentedNov 11, 2018
Should we add a unit test for this? |
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs OutdatedShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
ContributorAuthor
dellis1972 commentedNov 12, 2018
@jonpryor I did :) |
jonpryor pushed a commit to jonpryor/xamarin-android that referenced this pull requestDec 20, 2018
)* [Xamarin.Android.Build.Tasks] Fix Aar directory resolution.Fixeddotnet#2408As part of the speed up process when extracting resourcesfrom assemblies and Aar files, we dont re-extract ifthe stamp file is newer than the assembly.The problem with that was in the case of Aar files wewere NOT adding the `res` or `asset` directories tothe list of resolved directories when we skipped extraction.As a result we got less `res` directories on a secondbuild.This commit fixes that.* Add Unit Test* Fix Compile Error
jonpryor added a commit that referenced this pull requestDec 20, 2018
…2556)Fixed#2408As part of the speed up process when extracting resourcesfrom assemblies and Aar files, we dont re-extract ifthe stamp file is newer than the assembly.The problem with that was in the case of Aar files wewere NOT adding the `res` or `asset` directories tothe list of resolved directories when we skipped extraction.As a result we got less `res` directories on a secondbuild.This commit fixes that.* Update ResolveLibraryProjectImports.csThe usage of `ITaskItem` and item metadata isn't needed on d15-9
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull requestJul 14, 2021
Changes:JamesNK/Newtonsoft.Json@12.0.3...13.0.1 *JamesNK/Newtonsoft.Json@ae9fe44e: Remove compiler package and update sourcelink (dotnet#2498) *JamesNK/Newtonsoft.Json@8ef66218: Remove prerelease for 13.0.1 *JamesNK/Newtonsoft.Json@11331f50: Update SDK to 5.0.200 (dotnet#2495) *JamesNK/Newtonsoft.Json@c7e8abc0: Update to 13.0.1-beta2 *JamesNK/Newtonsoft.Json@1745d7c1: Fix JTokenWriter when writing comment to an object (dotnet#2493) *JamesNK/Newtonsoft.Json@583eb120: Fix missing error when deserializing JToken with a contract type mismatch (dotnet#2494) *JamesNK/Newtonsoft.Json@b6dc05be: Change MaxDepth default to 64 (dotnet#2473) *JamesNK/Newtonsoft.Json@15525f1c: Fix JsonWriter.WriteToken to allow null with string token (dotnet#2472) *JamesNK/Newtonsoft.Json@926d2f0f: Enable embed untracked sources (dotnet#2471) *JamesNK/Newtonsoft.Json@0a56633b:Fixesdotnet#2372 - variable typos (dotnet#2465) *JamesNK/Newtonsoft.Json@5a35c77d: Update version to 13.0.1 (dotnet#2463) *JamesNK/Newtonsoft.Json@7e77bbe1: Change JsonReader and JsonSerializer default max depth to 128 (dotnet#2462) *JamesNK/Newtonsoft.Json@42139ea6: Add JsonSelectSettings and regex timeout *JamesNK/Newtonsoft.Json@95a6eb3a: jpath regex timeout support added for a single regex expression, global umbrella for all regex calls, and support for allowing regex calls to get compiled if necessary *JamesNK/Newtonsoft.Json@1403f5d3: Fix serializing nullable struct dictionaries (dotnet#2452) *JamesNK/Newtonsoft.Json@60be32f4: Use naming strategy when deserializing dictionary enum keys (dotnet#2448) *JamesNK/Newtonsoft.Json@ff5ffb28: Copy annotations when cloning elements (dotnet#2442) *JamesNK/Newtonsoft.Json@0cf47a46: Missing nullability annotation (dotnet#2438) *JamesNK/Newtonsoft.Json@6795ca55: Fixed tests to work in Moscow, Russia UTC+3 timezone. (dotnet#2416) *JamesNK/Newtonsoft.Json@c918ca86: Code Typo Fix: Universial => Universal (dotnet#2383) *JamesNK/Newtonsoft.Json@c298f3d6: Fix typo in SerializeTypeNameHandling sample (dotnet#2428) *JamesNK/Newtonsoft.Json@a222c8b6: Update to net50 and fix warnings (dotnet#2424) *JamesNK/Newtonsoft.Json@666d9760: Fix wrong define is used in StringUtils.ToLower() (dotnet#2304) *JamesNK/Newtonsoft.Json@a31156e9: Update NullValueHandlingIgnore.aml (dotnet#2226) *JamesNK/Newtonsoft.Json@936acbf6: Update version to 13.0.1-beta and remove portable builds (dotnet#2228) *JamesNK/Newtonsoft.Json@9be95e0f: Do not treat ignored field as missing member when deserializing from overriden json constructor (dotnet#2224)
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull requestJul 15, 2021
Changes:JamesNK/Newtonsoft.Json@12.0.3...13.0.1 *JamesNK/Newtonsoft.Json@ae9fe44e: Remove compiler package and update sourcelink (dotnet#2498) *JamesNK/Newtonsoft.Json@8ef66218: Remove prerelease for 13.0.1 *JamesNK/Newtonsoft.Json@11331f50: Update SDK to 5.0.200 (dotnet#2495) *JamesNK/Newtonsoft.Json@c7e8abc0: Update to 13.0.1-beta2 *JamesNK/Newtonsoft.Json@1745d7c1: Fix JTokenWriter when writing comment to an object (dotnet#2493) *JamesNK/Newtonsoft.Json@583eb120: Fix missing error when deserializing JToken with a contract type mismatch (dotnet#2494) *JamesNK/Newtonsoft.Json@b6dc05be: Change MaxDepth default to 64 (dotnet#2473) *JamesNK/Newtonsoft.Json@15525f1c: Fix JsonWriter.WriteToken to allow null with string token (dotnet#2472) *JamesNK/Newtonsoft.Json@926d2f0f: Enable embed untracked sources (dotnet#2471) *JamesNK/Newtonsoft.Json@0a56633b:Fixesdotnet#2372 - variable typos (dotnet#2465) *JamesNK/Newtonsoft.Json@5a35c77d: Update version to 13.0.1 (dotnet#2463) *JamesNK/Newtonsoft.Json@7e77bbe1: Change JsonReader and JsonSerializer default max depth to 128 (dotnet#2462) *JamesNK/Newtonsoft.Json@42139ea6: Add JsonSelectSettings and regex timeout *JamesNK/Newtonsoft.Json@95a6eb3a: jpath regex timeout support added for a single regex expression, global umbrella for all regex calls, and support for allowing regex calls to get compiled if necessary *JamesNK/Newtonsoft.Json@1403f5d3: Fix serializing nullable struct dictionaries (dotnet#2452) *JamesNK/Newtonsoft.Json@60be32f4: Use naming strategy when deserializing dictionary enum keys (dotnet#2448) *JamesNK/Newtonsoft.Json@ff5ffb28: Copy annotations when cloning elements (dotnet#2442) *JamesNK/Newtonsoft.Json@0cf47a46: Missing nullability annotation (dotnet#2438) *JamesNK/Newtonsoft.Json@6795ca55: Fixed tests to work in Moscow, Russia UTC+3 timezone. (dotnet#2416) *JamesNK/Newtonsoft.Json@c918ca86: Code Typo Fix: Universial => Universal (dotnet#2383) *JamesNK/Newtonsoft.Json@c298f3d6: Fix typo in SerializeTypeNameHandling sample (dotnet#2428) *JamesNK/Newtonsoft.Json@a222c8b6: Update to net50 and fix warnings (dotnet#2424) *JamesNK/Newtonsoft.Json@666d9760: Fix wrong define is used in StringUtils.ToLower() (dotnet#2304) *JamesNK/Newtonsoft.Json@a31156e9: Update NullValueHandlingIgnore.aml (dotnet#2226) *JamesNK/Newtonsoft.Json@936acbf6: Update version to 13.0.1-beta and remove portable builds (dotnet#2228) *JamesNK/Newtonsoft.Json@9be95e0f: Do not treat ignored field as missing member when deserializing from overriden json constructor (dotnet#2224)The `PackagingTest.NetStandardReferenceTest()` test is updated to nolonger list `Microsoft.CSharp.dll` as an expected file, as with`Newtonsoft.Json.dll` v13.0.1, our build now consumes thenetstandard2.0-profile version, not the netstandard1.3 version, andthe netstandard 2.0 version doesn't require `Microsoft.CSharp.dll`.
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull requestJul 15, 2021
Changes:JamesNK/Newtonsoft.Json@12.0.3...13.0.1 *JamesNK/Newtonsoft.Json@ae9fe44e: Remove compiler package and update sourcelink (dotnet#2498) *JamesNK/Newtonsoft.Json@8ef66218: Remove prerelease for 13.0.1 *JamesNK/Newtonsoft.Json@11331f50: Update SDK to 5.0.200 (dotnet#2495) *JamesNK/Newtonsoft.Json@c7e8abc0: Update to 13.0.1-beta2 *JamesNK/Newtonsoft.Json@1745d7c1: Fix JTokenWriter when writing comment to an object (dotnet#2493) *JamesNK/Newtonsoft.Json@583eb120: Fix missing error when deserializing JToken with a contract type mismatch (dotnet#2494) *JamesNK/Newtonsoft.Json@b6dc05be: Change MaxDepth default to 64 (dotnet#2473) *JamesNK/Newtonsoft.Json@15525f1c: Fix JsonWriter.WriteToken to allow null with string token (dotnet#2472) *JamesNK/Newtonsoft.Json@926d2f0f: Enable embed untracked sources (dotnet#2471) *JamesNK/Newtonsoft.Json@0a56633b:Fixesdotnet#2372 - variable typos (dotnet#2465) *JamesNK/Newtonsoft.Json@5a35c77d: Update version to 13.0.1 (dotnet#2463) *JamesNK/Newtonsoft.Json@7e77bbe1: Change JsonReader and JsonSerializer default max depth to 128 (dotnet#2462) *JamesNK/Newtonsoft.Json@42139ea6: Add JsonSelectSettings and regex timeout *JamesNK/Newtonsoft.Json@95a6eb3a: jpath regex timeout support added for a single regex expression, global umbrella for all regex calls, and support for allowing regex calls to get compiled if necessary *JamesNK/Newtonsoft.Json@1403f5d3: Fix serializing nullable struct dictionaries (dotnet#2452) *JamesNK/Newtonsoft.Json@60be32f4: Use naming strategy when deserializing dictionary enum keys (dotnet#2448) *JamesNK/Newtonsoft.Json@ff5ffb28: Copy annotations when cloning elements (dotnet#2442) *JamesNK/Newtonsoft.Json@0cf47a46: Missing nullability annotation (dotnet#2438) *JamesNK/Newtonsoft.Json@6795ca55: Fixed tests to work in Moscow, Russia UTC+3 timezone. (dotnet#2416) *JamesNK/Newtonsoft.Json@c918ca86: Code Typo Fix: Universial => Universal (dotnet#2383) *JamesNK/Newtonsoft.Json@c298f3d6: Fix typo in SerializeTypeNameHandling sample (dotnet#2428) *JamesNK/Newtonsoft.Json@a222c8b6: Update to net50 and fix warnings (dotnet#2424) *JamesNK/Newtonsoft.Json@666d9760: Fix wrong define is used in StringUtils.ToLower() (dotnet#2304) *JamesNK/Newtonsoft.Json@a31156e9: Update NullValueHandlingIgnore.aml (dotnet#2226) *JamesNK/Newtonsoft.Json@936acbf6: Update version to 13.0.1-beta and remove portable builds (dotnet#2228) *JamesNK/Newtonsoft.Json@9be95e0f: Do not treat ignored field as missing member when deserializing from overriden json constructor (dotnet#2224)The `PackagingTest.NetStandardReferenceTest()` test is updated, asthe list of implicitly referenced assemblies changed: * `Microsoft.CSharp.dll` is no longer referenced * `System.Data.dll` is now referenced.It appears that the primary cause of this change is that with`Newtonsoft.Json` 12.0.3, the .NET Standard 1.3-profile assemblieswere included into the app, while with 13.0.1, the .NET Standard-2.0profile assemblies are instead used.
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull requestJul 16, 2021
Changes:JamesNK/Newtonsoft.Json@12.0.3...13.0.1 *JamesNK/Newtonsoft.Json@ae9fe44e: Remove compiler package and update sourcelink (dotnet#2498) *JamesNK/Newtonsoft.Json@8ef66218: Remove prerelease for 13.0.1 *JamesNK/Newtonsoft.Json@11331f50: Update SDK to 5.0.200 (dotnet#2495) *JamesNK/Newtonsoft.Json@c7e8abc0: Update to 13.0.1-beta2 *JamesNK/Newtonsoft.Json@1745d7c1: Fix JTokenWriter when writing comment to an object (dotnet#2493) *JamesNK/Newtonsoft.Json@583eb120: Fix missing error when deserializing JToken with a contract type mismatch (dotnet#2494) *JamesNK/Newtonsoft.Json@b6dc05be: Change MaxDepth default to 64 (dotnet#2473) *JamesNK/Newtonsoft.Json@15525f1c: Fix JsonWriter.WriteToken to allow null with string token (dotnet#2472) *JamesNK/Newtonsoft.Json@926d2f0f: Enable embed untracked sources (dotnet#2471) *JamesNK/Newtonsoft.Json@0a56633b:Fixesdotnet#2372 - variable typos (dotnet#2465) *JamesNK/Newtonsoft.Json@5a35c77d: Update version to 13.0.1 (dotnet#2463) *JamesNK/Newtonsoft.Json@7e77bbe1: Change JsonReader and JsonSerializer default max depth to 128 (dotnet#2462) *JamesNK/Newtonsoft.Json@42139ea6: Add JsonSelectSettings and regex timeout *JamesNK/Newtonsoft.Json@95a6eb3a: jpath regex timeout support added for a single regex expression, global umbrella for all regex calls, and support for allowing regex calls to get compiled if necessary *JamesNK/Newtonsoft.Json@1403f5d3: Fix serializing nullable struct dictionaries (dotnet#2452) *JamesNK/Newtonsoft.Json@60be32f4: Use naming strategy when deserializing dictionary enum keys (dotnet#2448) *JamesNK/Newtonsoft.Json@ff5ffb28: Copy annotations when cloning elements (dotnet#2442) *JamesNK/Newtonsoft.Json@0cf47a46: Missing nullability annotation (dotnet#2438) *JamesNK/Newtonsoft.Json@6795ca55: Fixed tests to work in Moscow, Russia UTC+3 timezone. (dotnet#2416) *JamesNK/Newtonsoft.Json@c918ca86: Code Typo Fix: Universial => Universal (dotnet#2383) *JamesNK/Newtonsoft.Json@c298f3d6: Fix typo in SerializeTypeNameHandling sample (dotnet#2428) *JamesNK/Newtonsoft.Json@a222c8b6: Update to net50 and fix warnings (dotnet#2424) *JamesNK/Newtonsoft.Json@666d9760: Fix wrong define is used in StringUtils.ToLower() (dotnet#2304) *JamesNK/Newtonsoft.Json@a31156e9: Update NullValueHandlingIgnore.aml (dotnet#2226) *JamesNK/Newtonsoft.Json@936acbf6: Update version to 13.0.1-beta and remove portable builds (dotnet#2228) *JamesNK/Newtonsoft.Json@9be95e0f: Do not treat ignored field as missing member when deserializing from overriden json constructor (dotnet#2224)The `PackagingTest.NetStandardReferenceTest()` test is updated, asthe list of implicitly referenced assemblies changed: * `Microsoft.CSharp.dll` is no longer referenced * `System.Data.dll` is now referenced.It appears that the primary cause of this change is that with`Newtonsoft.Json` 12.0.3, the .NET Standard 1.3-profile assemblieswere included into the app, while with 13.0.1, the .NET Standard-2.0profile assemblies are instead used.
jonpryor added a commit that referenced this pull requestJul 16, 2021
Changes:JamesNK/Newtonsoft.Json@12.0.3...13.0.1 *JamesNK/Newtonsoft.Json@ae9fe44e: Remove compiler package and update sourcelink (#2498) *JamesNK/Newtonsoft.Json@8ef66218: Remove prerelease for 13.0.1 *JamesNK/Newtonsoft.Json@11331f50: Update SDK to 5.0.200 (#2495) *JamesNK/Newtonsoft.Json@c7e8abc0: Update to 13.0.1-beta2 *JamesNK/Newtonsoft.Json@1745d7c1: Fix JTokenWriter when writing comment to an object (#2493) *JamesNK/Newtonsoft.Json@583eb120: Fix missing error when deserializing JToken with a contract type mismatch (#2494) *JamesNK/Newtonsoft.Json@b6dc05be: Change MaxDepth default to 64 (#2473) *JamesNK/Newtonsoft.Json@15525f1c: Fix JsonWriter.WriteToken to allow null with string token (#2472) *JamesNK/Newtonsoft.Json@926d2f0f: Enable embed untracked sources (#2471) *JamesNK/Newtonsoft.Json@0a56633b:Fixes#2372 - variable typos (#2465) *JamesNK/Newtonsoft.Json@5a35c77d: Update version to 13.0.1 (#2463) *JamesNK/Newtonsoft.Json@7e77bbe1: Change JsonReader and JsonSerializer default max depth to 128 (#2462) *JamesNK/Newtonsoft.Json@42139ea6: Add JsonSelectSettings and regex timeout *JamesNK/Newtonsoft.Json@95a6eb3a: jpath regex timeout support added for a single regex expression, global umbrella for all regex calls, and support for allowing regex calls to get compiled if necessary *JamesNK/Newtonsoft.Json@1403f5d3: Fix serializing nullable struct dictionaries (#2452) *JamesNK/Newtonsoft.Json@60be32f4: Use naming strategy when deserializing dictionary enum keys (#2448) *JamesNK/Newtonsoft.Json@ff5ffb28: Copy annotations when cloning elements (#2442) *JamesNK/Newtonsoft.Json@0cf47a46: Missing nullability annotation (#2438) *JamesNK/Newtonsoft.Json@6795ca55: Fixed tests to work in Moscow, Russia UTC+3 timezone. (#2416) *JamesNK/Newtonsoft.Json@c918ca86: Code Typo Fix: Universial => Universal (#2383) *JamesNK/Newtonsoft.Json@c298f3d6: Fix typo in SerializeTypeNameHandling sample (#2428) *JamesNK/Newtonsoft.Json@a222c8b6: Update to net50 and fix warnings (#2424) *JamesNK/Newtonsoft.Json@666d9760: Fix wrong define is used in StringUtils.ToLower() (#2304) *JamesNK/Newtonsoft.Json@a31156e9: Update NullValueHandlingIgnore.aml (#2226) *JamesNK/Newtonsoft.Json@936acbf6: Update version to 13.0.1-beta and remove portable builds (#2228) *JamesNK/Newtonsoft.Json@9be95e0f: Do not treat ignored field as missing member when deserializing from overriden json constructor (#2224)The `PackagingTest.NetStandardReferenceTest()` test is updated, asthe list of implicitly referenced assemblies changed: * `Microsoft.CSharp.dll` is no longer referenced * `System.Data.dll` is now referenced.It appears that the primary cause of this change is that with`Newtonsoft.Json` 12.0.3, the .NET Standard 1.3-profile assemblieswere included into the app, while with 13.0.1, the .NET Standard-2.0profile assemblies are instead used.
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
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.
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
resorassetdirectories tothe list of resolved directories when we skipped extraction.
As a result we got less
resdirectories on a secondbuild.
This commit fixes that.