Bump to xamarin/Java.Interop/main@2573dc8c #5945
Merged
Conversation
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
jonpryor
force-pushed
the
jonp-bump-ji-2573dc8c
branch
from
0f6a3b7 to
2fbc2e9
Compare
jonpryor
added a commit
to dotnet/java-interop
that referenced
this pull request
May 21, 2021
Context: dotnet/android#5945 Context: https://github.com/xamarin/xamarin-android/blob/d5ef9982dc7b9efc22f7efb80ed0b58ff0bd7cdb/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj#L43-L46 Xamarin.Android's `Microsoft.Android.Sdk.ILLink.dll` assembly uses `TypeDefinitionCache`, but doesn't reference the `Java.Interop.Tools.Cecil.dll` assembly. Instead, it references some of the sources in `src/Java.Interop.Tools.Cecil`, and *no* sources for any of `Java.Interop.Tools.Cecil.dll`s dependencies, such as `Java.Interop.Tools.Diagnostics.dll`. This meant that while commit 2573dc8 built for Java.Interop, it broke the xamarin-android build, by introducing an (unnecessary) `using Java.Interop.Tools.Diagnostics` into `TypeDefinitionCache.cs`: …/TypeDefinitionCache.cs(4,26): error CS0234: The type or namespace name 'Diagnostics' does not exist in the namespace 'Java.Interop.Tools' (are you missing an assembly reference?) […/xamarin-android/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj] The `using Java.Interop.Tools.Diagnostics` wasn't actually needed; it was part of an unnecessary tangent. Remove the `using Java.Interop.Tools.Diagnostics` statement, allowing the xamarin-android build to progress.
Fixes: dotnet/java-interop#835 Fixes: dotnet#5921 Context: dotnet#5894 Changes: http://github.com/xamarin/Java.Interop/compare/12e670a8560f69581d3a3adf0a9d91e8ce8c9afa...a5ed8919fb2ec894cb8144e51ae7c29b4811ee2a * dotnet/java-interop@a5ed8919: [Java.Interop.Tools.Cecil] Fix the xamarin-android build * dotnet/java-interop@2573dc8c: [Java.Interop.Tools.*] IMetadataResolver not TypeDefinitionCache (dotnet#842) * dotnet/java-interop@412e974b: Revert "[generator] Disable [SupportedOSPlatform] until .NET 5/6. (dotnet#781)" (dotnet#841) * dotnet/java-interop@23baf0bc: [Java.Interop] Fix NRT warnings introduced by targeting 'net6.0' (dotnet#840) * dotnet/java-interop@131c1496: [generator] Fix NRE from return type not consistently set (dotnet#834) * dotnet/java-interop@100fffc1: [generator] Ensure "global::" is prepended to generic return casts. (dotnet#838) * dotnet/java-interop@9b89e90e: [generator] Ignore types without names (dotnet#837) * dotnet/java-interop@0e01fb5d: [Java.Interop.Tools.JavaSource] Merge @return block values (dotnet#836)
jonpryor
force-pushed
the
jonp-bump-ji-2573dc8c
branch
from
2fbc2e9 to
6124f6d
Compare
Sign up for free
to 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.
Fixes: dotnet/java-interop#835
Fixes: #5921
Context: #5894
Changes: http://github.com/xamarin/Java.Interop/compare/12e670a8560f69581d3a3adf0a9d91e8ce8c9afa...2573dc8c84fd4eb68e75bcae73912c26f4942356