From 2c9fbbe0689464923e5edb94c554df1aa5a68690 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 18 Dec 2024 19:15:42 -0500 Subject: [PATCH] Bump to dotnet/java-interop/main@2c06b3c2 Changes: https://github.com/dotnet/java-interop/compare/f800ea52dce62f126926d4b96121681508d506a1...2c06b3c2a11833aea0e9b51aac2a72195bd64539 * dotnet/java-interop@2c06b3c2: [Java.Interop] remove `DynamicallyAccessedMemberTypes.Interfaces` (dotnet/java-interop#1285) --- external/Java.Interop | 2 +- src/Mono.Android/Android.Graphics/Color.cs | 4 ++-- src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs | 4 ++-- .../acceptable-breakages-vReference-net9.0.txt | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/external/Java.Interop b/external/Java.Interop index f800ea52dce..2c06b3c2a11 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit f800ea52dce62f126926d4b96121681508d506a1 +Subproject commit 2c06b3c2a11833aea0e9b51aac2a72195bd64539 diff --git a/src/Mono.Android/Android.Graphics/Color.cs b/src/Mono.Android/Android.Graphics/Color.cs index 55fe416c5bc..781895ed2c2 100644 --- a/src/Mono.Android/Android.Graphics/Color.cs +++ b/src/Mono.Android/Android.Graphics/Color.cs @@ -395,7 +395,7 @@ public static void RGBToHSV (int red, int green, int blue, float[] hsv) public class ColorValueMarshaler : JniValueMarshaler { - const DynamicallyAccessedMemberTypes ConstructorsAndInterfaces = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.Interfaces; + const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors; const string ExpressionRequiresUnreferencedCode = "System.Linq.Expression usage may trim away required code."; public override Type MarshalType { @@ -405,7 +405,7 @@ public override Type MarshalType { public override Color CreateGenericValue ( ref JniObjectReference reference, JniObjectReferenceOptions options, - [DynamicallyAccessedMembers (ConstructorsAndInterfaces)] + [DynamicallyAccessedMembers (Constructors)] Type targetType) { throw new NotImplementedException (); diff --git a/src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs b/src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs index 7b57dff3b92..79230b9d2eb 100644 --- a/src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs +++ b/src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs @@ -10,7 +10,7 @@ namespace Android.Runtime { sealed class IJavaObjectValueMarshaler : JniValueMarshaler { - const DynamicallyAccessedMemberTypes ConstructorsAndInterfaces = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.Interfaces; + const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors; const string ExpressionRequiresUnreferencedCode = "System.Linq.Expression usage may trim away required code."; internal static IJavaObjectValueMarshaler Instance = new IJavaObjectValueMarshaler (); @@ -18,7 +18,7 @@ sealed class IJavaObjectValueMarshaler : JniValueMarshaler { public override IJavaObject CreateGenericValue ( ref JniObjectReference reference, JniObjectReferenceOptions options, - [DynamicallyAccessedMembers (ConstructorsAndInterfaces)] + [DynamicallyAccessedMembers (Constructors)] Type? targetType) { throw new NotImplementedException (); diff --git a/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt b/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt index 9916b31e8dd..0c438be3d19 100644 --- a/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt +++ b/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt @@ -1 +1,2 @@ Compat issues with assembly Mono.Android: +CannotChangeAttribute : Attribute 'System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute' on parameter 'targetType' on member 'Android.Graphics.ColorValueMarshaler.CreateGenericValue(Java.Interop.JniObjectReference, Java.Interop.JniObjectReferenceOptions, System.Type)' changed from '[DynamicallyAccessedMembersAttribute(8199)]' in the contract to '[DynamicallyAccessedMembersAttribute(7)]' in the implementation.