Skip to content

Commit a4d207f

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@fa261b952d 9.0.100-preview.5.24253.16 (#8921)
Changes: dotnet/installer@d301a12...fa261b9 Changes: dotnet/runtime@d92ac1f...4326eb7 Changes: dotnet/emsdk@19c9523...53288f8 Changes: dotnet/cecil@861f49c...4abe3e6 Updates: * Microsoft.Dotnet.Sdk.Internal: from 9.0.100-preview.5.24229.2 to 9.0.100-preview.5.24253.16 * Microsoft.NETCore.App.Ref: from 9.0.0-preview.4.24223.11 to 9.0.0-preview.4.24251.3 * Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.4.24215.3 to 9.0.0-preview.5.24223.2 * Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.4.24223.11 to 9.0.0-preview.4.24251.3 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.24215.1 to 0.11.4-alpha.24222.1 Other changes: * [Mono.Android] fix trimmer warning in `JNIEnvInit` 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. Add appropriate attributes on a local method to silence the warning. Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 0781fac commit a4d207f

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.5.24229.2">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.5.24253.16">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>d301a122c4f9d017cdc3a506f831e2edfc124ea7</Sha>
5+
<Sha>fa261b952d702c6bd604728fcbdb58ac071a22b1</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24223.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24251.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>d92ac1f892a7f9c00561db6541671f25f3972eed</Sha>
9+
<Sha>4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24223.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24251.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>d92ac1f892a7f9c00561db6541671f25f3972eed</Sha>
13+
<Sha>4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24215.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.5.24223.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>19c9523f5c2dd091b49959700723af795d6ad2b4</Sha>
17+
<Sha>53288f87c588907e8ff01f129786820fe998573c</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24215.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24222.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>861f49c137941b9722a43e5993ccac7716c8528c</Sha>
21+
<Sha>4abe3e63a5d4653ca098c633644432c1395411c1</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.5.24229.2</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24223.11</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24223.11</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.5.24253.16</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24251.3</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24251.3</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.4.24215.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.5.24223.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24215.1</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24222.1</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

‎src/Mono.Android/Android.Runtime/JNIEnvInit.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Diagnostics.CodeAnalysis;
23
using System.Reflection;
34
using System.Runtime.CompilerServices;
45
using System.Runtime.InteropServices;
@@ -54,8 +55,14 @@ internal struct JnienvInitializeArgs {
5455
[UnmanagedCallersOnly]
5556
static unsafe void RegisterJniNatives (IntPtr typeName_ptr, int typeName_len, IntPtr jniClass, IntPtr methods_ptr, int methods_len)
5657
{
58+
// FIXME: https://github.com/xamarin/xamarin-android/issues/8724
59+
[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type should be preserved by the MarkJavaObjects trimmer step.")]
60+
[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
61+
static Type TypeGetType (string typeName) =>
62+
Type.GetType (typeName, throwOnError: false);
63+
5764
string typeName = new string ((char*) typeName_ptr, 0, typeName_len);
58-
var type = Type.GetType (typeName);
65+
var type = TypeGetType (typeName);
5966
if (type == null) {
6067
RuntimeNativeMethods.monodroid_log (LogLevel.Error,
6168
LogCategories.Default,

0 commit comments

Comments
 (0)