Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b6542e5ec
Choose a base ref
...
head repository: dotnet/android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5fe71c5da1
Choose a head ref
  • 4 commits
  • 7 files changed
  • 3 contributors

Commits on Sep 19, 2025

  1. [CoreCLR] Dynamically build custom delegate types to support [Export] (… 

    …#10503)

The problem is that the Marshal.GetFunctionPointerForDelegate method
does not work with delegates with generic types, such as `Action<...>`
or `Func<...>` (context:
dotnet/runtime#32963), which was the case of
all the delegates created in `Mono.Android.Export` through
`DynamicMethod`.

This PR replaces the use of these generic delegate types with
dynamically built non-generic types. It is based on an existing
implementation in java-interop (see [here][0]).
The CoreCLR is able to marshal the delegates built with these types to
function pointers just fine.

In a previous attempt at fixing this issue (#10493), I chose a
solution which modified the shape of `JniNativeMethodRegistration`
which would be an ABI breaking change (dotnet/java-interop#1364). This
implementation is much simpler and doesn't cause the same problem.
Thanks to @jonpryor for steering me in this direction.

[0]: https://github.com/dotnet/java-interop/blob/02bceb03f7c07858590d930ef507745a88200a48/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs#L274-L311
    @simonrozsival
    simonrozsival authored Sep 19, 2025
    Configuration menu
    Copy the full SHA
    0a91e1e View commit details
    Browse the repository at this point in the history

  2. Bump to dotnet/dotnet@664567ff4c 10.0.100-rc.2.25468.101 (#10501) 

    Changes: dotnet/dotnet@ee760c4...664567f

- **Updates**:
  - From [10.0.0-beta.25462.117 to 10.0.0-beta.25468.101][1]
     - Microsoft.DotNet.Build.Tasks.Feed
  - From [0.11.5-alpha.25462.117 to 0.11.5-alpha.25468.101][1]
     - Microsoft.DotNet.Cecil
  - From [10.0.0-rc.2.25462.117 to 10.0.0-rc.2.25468.101][1]
     - Microsoft.NET.ILLink.Tasks
     - Microsoft.NETCore.App.Ref
  - From [10.0.100-rc.2.25462.117 to 10.0.100-rc.2.25468.101][1]
     - Microsoft.NET.Sdk
     - Microsoft.TemplateEngine.Authoring.Tasks

[1]: dotnet/dotnet@ee760c4...664567f
    @dotnet-maestro
    dotnet-maestro[bot] authored Sep 19, 2025
    Configuration menu
    Copy the full SHA
    fd2286c View commit details
    Browse the repository at this point in the history

  3. [nativeaot] Implement _monodroid_weak_gref_delete (#10504) 

    Context: #10496 (comment)
Context: 869b0e0

The `_monodroid_weak_gref_delete` p/invoke wasn't implemented
in 869b0e0 as it was thought to be unused. However, the test
failure in #10496 shows that it's not true.

Bring the `_monodroid_weak_gref_delete` implementation to NativeAOT
host from the CoreCLR host.
    @grendello
    grendello authored Sep 19, 2025
    Configuration menu
    Copy the full SHA
    7ed894b View commit details
    Browse the repository at this point in the history

  4. Bump to dotnet/dotnet@2dea164f01 10.0.100-rc.2.25468.104 (#10505) 

    Changes: dotnet/dotnet@664567f...2dea164

- **Updates**:
  - From [10.0.0-beta.25468.101 to 10.0.0-beta.25468.104][1]
     - Microsoft.DotNet.Build.Tasks.Feed
  - From [0.11.5-alpha.25468.101 to 0.11.5-alpha.25468.104][1]
     - Microsoft.DotNet.Cecil
  - From [10.0.0-rc.2.25468.101 to 10.0.0-rc.2.25468.104][1]
     - Microsoft.NET.ILLink.Tasks
     - Microsoft.NETCore.App.Ref
  - From [10.0.100-rc.2.25468.101 to 10.0.100-rc.2.25468.104][1]
     - Microsoft.NET.Sdk
     - Microsoft.TemplateEngine.Authoring.Tasks

[1]: dotnet/dotnet@664567f...2dea164
    @dotnet-maestro
    dotnet-maestro[bot] authored Sep 19, 2025
    Configuration menu
    Copy the full SHA
    5fe71c5 View commit details
    Browse the repository at this point in the history
Loading