Skip to content

Commit

Permalink
Bump to dotnet/sdk@c204043de1 9.0.100-rc.2.24468.2 (dotnet#9311)
Browse files Browse the repository at this point in the history 
Changes: dotnet/sdk@dc86952...c204043
Changes: dotnet/runtime@dec716d...46cfb74
Changes: dotnet/emsdk@c8026c0...6e079c2

Updates:

* Microsoft.NET.Sdk: from 9.0.100-rc.2.24459.3 to 9.0.100-rc.2.24468.2
* Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24463.7
* Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-rc.2.24454.2 to 9.0.0-rc.2.24455.1
* Microsoft.NET.ILLink.Tasks: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24463.7

~~ Other changes ~~

* Add `[RequiresDynamicCode]` for System.Linq.Expressions

Fixes the build error(s):

    src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs(40,11): error IL3050:
    Using member 'System.Linq.Expressions.Expression.Call(Type, String, Type[], params Expression[])' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling. Calling a generic method requires dynamic code generation. This can be suppressed if the method is not generic.
    src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs(54,7): error IL3050:
    Using member 'System.Linq.Expressions.Expression.Call(Type, String, Type[], params Expression[])' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling. Calling a generic method requires dynamic code generation. This can be suppressed if the method is not generic.

* Feeds for dotnet/runtime 8.0.10

* Bump to dotnet/java-interop@d8599654

Changes: dotnet/java-interop@51b784a...d859965

  * Bump external/xamarin-android-tools from 6575743 to 11fad9d
  * [Java.Interop] Add [RequiresDynamicCode] attribute
  * Bump to dotnet/android-tools@ab2165d

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
  • Loading branch information
@dotnet-maestro @jonathanpeppers
dotnet-maestro[bot] and jonathanpeppers authored Sep 24, 2024
1 parent 852c38e commit 1071be1
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 16 deletions.
6 changes: 3 additions & 3 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.9 -->
<add key="darc-pub-dotnet-emsdk-2674f58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2674f580/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-ed13b35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.10 -->
<add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-b5f5349" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b5f53494/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.2.24459.3">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.2.24468.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>dc8695276bd1ec6cc1f1b0cf3ae55875eda3ad14</Sha>
<Sha>c204043de141a4d00ae5b4ec1b82aab67cccac1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.2.24456.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24456.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24463.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.2.24454.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.2.24455.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>c8026c0932574ddad057e54d983ab8c2ba082b93</Sha>
<Sha>6e079c23aee94577c17bae34522b52df0d646ca5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24419.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>9.0.100-rc.2.24459.3</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-rc.2.24468.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.2.24456.9</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.2.24456.9</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.2.24463.7</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.2.24463.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.2.24454.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.2.24455.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24419.1</MicrosoftDotNetCecilPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Submodule Java.Interop updated 7 files
+1 −1 external/xamarin-android-tools
+8 −0 src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs
+16 −0 src/Java.Interop/Java.Interop/JniBuiltinMarshalers.cs
+2 −0 src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
+4 −0 src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
+2 −0 src/Java.Interop/Java.Interop/JniStringValueMarshaler.cs
+2 −0 src/Java.Interop/Java.Interop/JniValueMarshaler.cs
2 changes: 2 additions & 0 deletions src/Mono.Android/Android.Graphics/Color.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ public override void DestroyGenericArgumentState (Color value, ref JniValueMarsh
throw new NotImplementedException ();
}

[RequiresDynamicCode (ExpressionRequiresUnreferencedCode)]
[RequiresUnreferencedCode (ExpressionRequiresUnreferencedCode)]
public override Expression CreateParameterToManagedExpression (JniValueMarshalerContext context, ParameterExpression sourceValue, ParameterAttributes synchronize, Type targetType)
{
Expand All @@ -442,6 +443,7 @@ public override Expression CreateParameterFromManagedExpression (JniValueMarshal
return r;
}

[RequiresDynamicCode (ExpressionRequiresUnreferencedCode)]
[RequiresUnreferencedCode (ExpressionRequiresUnreferencedCode)]
public override Expression CreateReturnValueFromManagedExpression (JniValueMarshalerContext context, ParameterExpression sourceValue)
{
Expand Down
2 changes: 2 additions & 0 deletions src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public override void DestroyGenericArgumentState ([AllowNull]IJavaObject value,
throw new NotImplementedException ();
}

[RequiresDynamicCode (ExpressionRequiresUnreferencedCode)]
[RequiresUnreferencedCode (ExpressionRequiresUnreferencedCode)]
public override Expression CreateReturnValueFromManagedExpression (JniValueMarshalerContext context, ParameterExpression sourceValue)
{
Expand All @@ -44,6 +45,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
sourceValue);
}

[RequiresDynamicCode (ExpressionRequiresUnreferencedCode)]
[RequiresUnreferencedCode (ExpressionRequiresUnreferencedCode)]
public override Expression CreateParameterToManagedExpression (JniValueMarshalerContext context, ParameterExpression sourceValue, ParameterAttributes synchronize, Type? targetType)
{
Expand Down

0 comments on commit 1071be1

Please sign in to comment.