diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7be9768996..2350c46bbab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - d301a122c4f9d017cdc3a506f831e2edfc124ea7 + fa261b952d702c6bd604728fcbdb58ac071a22b1 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/emsdk - 19c9523f5c2dd091b49959700723af795d6ad2b4 + 53288f87c588907e8ff01f129786820fe998573c - + https://github.com/dotnet/cecil - 861f49c137941b9722a43e5993ccac7716c8528c + 4abe3e63a5d4653ca098c633644432c1395411c1 diff --git a/eng/Versions.props b/eng/Versions.props index 79922e97ab2..df014a9dd8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 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.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.24215.3 + 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) diff --git a/src/Mono.Android/Android.Runtime/JNIEnvInit.cs b/src/Mono.Android/Android.Runtime/JNIEnvInit.cs index 2f65464716b..2b3bed66a3c 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; @@ -54,8 +55,14 @@ 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.")] + [return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)] + 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,