From e73dcda55b8bc61f65433b33cb082603bbb1573f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 May 2024 13:39:42 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/installer build 20240503.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.5.24229.2 -> To Version 9.0.100-preview.5.24253.2 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.4.24223.11 -> To Version 9.0.0-preview.4.24225.8 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7be9768996..053f271ec05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - d301a122c4f9d017cdc3a506f831e2edfc124ea7 + 23c59f686d9425035600a81a0a99357c12c9e09b - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/emsdk - 19c9523f5c2dd091b49959700723af795d6ad2b4 + 9d28301f6a5f512db14f242f7403a4bfbcbcc8a4 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 79922e97ab2..1c30ec32cbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 9.0.100-preview.5.24229.2 - 9.0.0-preview.4.24223.11 - 9.0.0-preview.4.24223.11 + 9.0.100-preview.5.24253.2 + 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24225.8 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-preview.4.24215.3 + 9.0.0-preview.4.24222.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 0.11.4-alpha.24215.1 From e5330230257766e0a175948c65193f3c7a740f9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 May 2024 13:14:15 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/installer build 20240503.16 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.5.24229.2 -> To Version 9.0.100-preview.5.24253.16 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 9.0.0-preview.4.24223.11 -> To Version 9.0.0-preview.4.24251.3 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 053f271ec05..2350c46bbab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 23c59f686d9425035600a81a0a99357c12c9e09b + fa261b952d702c6bd604728fcbdb58ac071a22b1 - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/emsdk - 9d28301f6a5f512db14f242f7403a4bfbcbcc8a4 + 53288f87c588907e8ff01f129786820fe998573c - + https://github.com/dotnet/cecil - 861f49c137941b9722a43e5993ccac7716c8528c + 4abe3e63a5d4653ca098c633644432c1395411c1 diff --git a/eng/Versions.props b/eng/Versions.props index 1c30ec32cbf..df014a9dd8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 9.0.100-preview.5.24253.2 - 9.0.0-preview.4.24225.8 - 9.0.0-preview.4.24225.8 + 9.0.100-preview.5.24253.16 + 9.0.0-preview.4.24251.3 + 9.0.0-preview.4.24251.3 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-preview.4.24222.2 + 9.0.0-preview.5.24223.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24215.1 + 0.11.4-alpha.24222.1 $(MicrosoftNETCoreAppRefPackageVersion) From 6c68cb4e5a534adc638cf7b3c9acf9b0cb93a4bf Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 6 May 2024 10:10:57 -0500 Subject: [PATCH 3/5] [Mono.Android] fix trimmer warning in `JNIEnvInit` There must be trimmer changes that detect this warning now: src/Mono.Android/Android.Runtime/JNIEnvInit.cs(58,15): error IL2057: Unrecognized value passed to the parameter 'typeName' of method 'System.Type.GetType(String)'. It's not possible to guarantee the availability of the target type. --- src/Mono.Android/Android.Runtime/JNIEnvInit.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs index 2f65464716b..a9d6f188837 100644 --- a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs +++ b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs @@ -54,8 +54,13 @@ internal struct JnienvInitializeArgs { [UnmanagedCallersOnly] static unsafe void RegisterJniNatives (IntPtr typeName_ptr, int typeName_len, IntPtr jniClass, IntPtr methods_ptr, int methods_len) { + // FIXME: https://github.com/xamarin/xamarin-android/issues/8724 + [UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type should be preserved by the MarkJavaObjects trimmer step.")] + static Type TypeGetType (string typeName) => + Type.GetType (typeName, throwOnError: false); + string typeName = new string ((char*) typeName_ptr, 0, typeName_len); - var type = Type.GetType (typeName); + var type = TypeGetType (typeName); if (type == null) { RuntimeNativeMethods.monodroid_log (LogLevel.Error, LogCategories.Default, From f6ce3cdd0daec500c69c28fd7f965b740717b8ee Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 6 May 2024 10:37:25 -0500 Subject: [PATCH 4/5] Update JNIEnvInit.cs --- src/Mono.Android/Android.Runtime/JNIEnvInit.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs index a9d6f188837..91be8b10f84 100644 --- a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs +++ b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics.CodeAnalysis; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; From 7fb79da77bb0ef4ef3e6efd4faa72979ce0e6526 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 6 May 2024 11:04:23 -0500 Subject: [PATCH 5/5] Add missing [DynamicallyAccessedMembers] --- src/Mono.Android/Android.Runtime/JNIEnvInit.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs index 91be8b10f84..2b3bed66a3c 100644 --- a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs +++ b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs @@ -57,6 +57,7 @@ static unsafe void RegisterJniNatives (IntPtr typeName_ptr, int typeName_len, In { // FIXME: https://github.com/xamarin/xamarin-android/issues/8724 [UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type should be preserved by the MarkJavaObjects trimmer step.")] + [return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)] static Type TypeGetType (string typeName) => Type.GetType (typeName, throwOnError: false);