-
Notifications
You must be signed in to change notification settings - Fork 538
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Xamarin.Android.Build.Tasks] <FilterAssemblies/> should look for .ja…
…r files (#3362) Fixes: #3343 Context: https://github.com/xamarin/XamarinComponents/blob/54646f5c0bef9c618c700628bd1167768d7c9b4f/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj Context: https://www.nuget.org/packages/Xamarin.Google.Guava.ListenableFuture/1.0.0 We introduced a performance improvement in 5ec3e3a that "classifies" assemblies as Xamarin.Android assemblies or not. This allows us to skip processing of NetStandard/BCL assemblies throughout the build. Unfortunately, the `Xamarin.Google.Guava.ListenableFuture.dll` assembly is "odd": * No `[assembly: TargetFramework]` attribute at all * No reference to `Mono.Android.dll` Without either of those, 5ec3e3a thinks that this assembly is *not* a Xamarin.Android-profile assembly, and thus skips processing. The only "marker" is that `Xamarin.Google.Guava.ListenableFuture.dll` has is a `.jar` file as an `@(EmbeddedResource)`, which is put there by the `@(EmbeddedJar)` Build action. The weirdness is related to it not having any C# code, and it using SDK-style projects. Fix support for the `Xamarin.Google.Guava.ListenableFuture.dll` and similar assemblies by updating the `<FilterAssemblies/>` task to look for: * `[assembly: TargetFramework("MonoAndroid,Version=v9.0")]` * `Mono.Android.dll` reference * `EmbeddedResource` ending with `*.jar` (this is new.) * `EmbeddedResource` beginning with `__Android` (this is new.) I also reworked this task so that the logic is hardcoded. It does not seem useful to pass in input parameters from MSBuild targets anymore.
- Loading branch information
1 parent
4826199
commit c66601e
Showing
5 changed files
with
92 additions
and
26 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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