[Mono.Android] call new Java "GC Bridge" APIs

.gitattributes

@@ -35,3 +35,5 @@ Makefile	eol=lf
 *.wixproj	eol=crlf
 *.wxs	eol=crlf
 *.rtf	eol=crlf
+
+packages/* filter=lfs diff=lfs merge=lfs -text

Documentation/workflow/DevelopmentTips.md

@@ -450,13 +450,26 @@ A second (better) way is to add this MSBuild target to your Android
 `.csproj` file:
 
 ```xml
-<Target Name="UpdateMonoRuntimePacks" BeforeTargets="ProcessFrameworkReferences">
+<Target Name="UpdateRuntimeVersion" BeforeTargets="ProcessFrameworkReferences">
+  <PropertyGroup>
+    <!-- This could be a version I built myself -->
+    <_Version>10.0.0-dev</_Version>
+  </PropertyGroup>
   <ItemGroup>
-      <KnownRuntimePack
-          Update="Microsoft.NETCore.App"
-          Condition=" '%(KnownRuntimePack.TargetFramework)' == 'net6.0' "
-          LatestRuntimeFrameworkVersion="6.0.0-preview.7.21364.3"
-      />
+    <!-- For runtime packs only -->
+    <KnownRuntimePack
+        Update="Microsoft.NETCore.App"
+        Condition=" '%(KnownRuntimePack.TargetFramework)' == 'net10.0' "
+        LatestRuntimeFrameworkVersion="$(_Version)"
+    />
+    <!-- For new .NET APIs -->
+    <KnownFrameworkReference
+        Update="Microsoft.NETCore.App"
+        Condition=" '%(KnownFrameworkReference.TargetingPackName)' == 'Microsoft.NETCore.App.Ref' and '%(KnownFrameworkReference.TargetFramework)' == 'net10.0' "
+        DefaultRuntimeFrameworkVersion="$(_Version)"
+        LatestRuntimeFrameworkVersion="$(_Version)"
+        TargetingPackVersion="$(_Version)"
+    />
   </ItemGroup>
 </Target>
 ```

NuGet.config

@@ -7,6 +7,7 @@
     <!--  End: Package sources from dotnet-android -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- ensure only the sources defined below are used -->
+    <add key="local-packages" value="packages" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
     <!-- This is for packages needed by debugger-libs -->

build-tools/automation/yaml-templates/build-linux.yaml

@@ -53,6 +53,12 @@ stages:
         path: ${{ parameters.checkoutPath }}
         persistCredentials: ${{ parameters.checkoutPersistCredentials }}
 
+    - script: |
+        git lfs install
+        git lfs pull
+      displayName: git lfs setup
+      workingDirectory: ${{ parameters.xaSourcePath }}
+
     # Always checkout a second resource to ensure we are using multi-repo checkout behavior
     #  https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path
     - checkout: maui

build-tools/automation/yaml-templates/build-macos.yaml

@@ -75,6 +75,12 @@ stages:
         path: ${{ parameters.checkoutPath }}
         persistCredentials: ${{ parameters.checkoutPersistCredentials }}
 
+    - script: |
+        git lfs install
+        git lfs pull
+      displayName: git lfs setup
+      workingDirectory: ${{ parameters.xaSourcePath }}
+
     - template: /build-tools/automation/yaml-templates/commercial-build.yaml
       parameters:
         xaSourcePath: ${{ parameters.xaSourcePath }}

build-tools/automation/yaml-templates/build-windows.yaml

@@ -35,6 +35,12 @@ stages:
         path: ${{ parameters.checkoutPath }}
         persistCredentials: ${{ parameters.checkoutPersistCredentials }}
 
+    - script: |
+        git lfs install
+        git lfs pull
+      displayName: git lfs setup
+      workingDirectory: ${{ parameters.xaSourcePath }}
+
     - template: /build-tools/automation/yaml-templates/kill-processes.yaml
 
     - template: /build-tools/automation/yaml-templates/clean.yaml

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -22,6 +22,12 @@ steps:
     clean: true
     submodules: recursive
 
+- script: |
+    git lfs install
+    git lfs pull
+  displayName: git lfs setup
+  workingDirectory: ${{ parameters.xaSourcePath }}
+
 - template: /build-tools/automation/yaml-templates/setup-jdk-variables.yaml
   parameters:
     jdkMajorVersion: ${{ parameters.jdkMajorVersion }}

build-tools/scripts/custom-runtime.targets

@@ -0,0 +1,22 @@
+<Project>
+  <!-- Use version in local packages folder -->
+  <Target Name="UpdateRuntimeVersion" BeforeTargets="ProcessFrameworkReferences">
+    <PropertyGroup>
+      <_Version>10.0.0-dev</_Version>
+    </PropertyGroup>
+    <ItemGroup>
+        <KnownFrameworkReference
+            Update="Microsoft.NETCore.App"
+            Condition=" '%(KnownFrameworkReference.TargetingPackName)' == 'Microsoft.NETCore.App.Ref' and '%(KnownFrameworkReference.TargetFramework)' == 'net10.0' "
+            DefaultRuntimeFrameworkVersion="$(_Version)"
+            LatestRuntimeFrameworkVersion="$(_Version)"
+            TargetingPackVersion="$(_Version)"
+        />
+        <KnownRuntimePack
+            Update="Microsoft.NETCore.App"
+            Condition=" '%(KnownRuntimePack.TargetFramework)' == 'net10.0' "
+            LatestRuntimeFrameworkVersion="$(_Version)"
+        />
+    </ItemGroup>
+  </Target>
+</Project>

src/Mono.Android.Runtime/Mono.Android.Runtime.csproj

@@ -64,5 +64,6 @@
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop\Java.Interop.csproj" />
   </ItemGroup>
 
+  <Import Project="..\..\build-tools\scripts\custom-runtime.targets" />
   <Import Project="Mono.Android.Runtime.targets" />
 </Project>

src/Mono.Android/Android.Runtime/RuntimeNativeMethods.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Java;
 using System.Text;
 
 namespace Android.Runtime
@@ -18,7 +19,7 @@ enum TraceKind : uint
 		All     = Java | Managed | Native | Signals,
 	}
 
-	internal static class RuntimeNativeMethods
+	internal unsafe static class RuntimeNativeMethods
 	{
 		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
 		internal extern static void monodroid_log (LogLevel level, LogCategories category, string message);
@@ -92,6 +93,17 @@ internal static class RuntimeNativeMethods
 		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
 		internal static extern bool clr_typemap_java_to_managed (string java_type_name, out IntPtr managed_assembly_name, out uint managed_type_token_id);
 
+		/// <summary>
+		/// TODO: implement this in the native side.
+		/// Initializes the "GC Bridge" implementation for the CoreCLR runtime.
+		/// </summary>
+		/// <param name="bridge_processing_finished_callback">A function pointer to a C# callback that will be invoked when bridge processing has completed.</param>
+		/// <returns>A function pointer that should be passed to JavaMarshal.Initialize() on startup.</returns>
+		[DllImport (RuntimeConstants.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
+		internal static extern delegate* unmanaged<MarkCrossReferences*, void> clr_initialize_gc_bridge (
+			delegate* unmanaged<MarkCrossReferences*, void> bridge_processing_finished_callback
+		);
+
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		internal static extern void monodroid_unhandled_exception (Exception javaException);
 

src/Mono.Android/Microsoft.Android.Runtime/ManagedValueManager.cs

@@ -10,6 +10,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Java;
 using System.Threading;
 using Android.Runtime;
 using Java.Interop;
@@ -20,10 +21,12 @@ class ManagedValueManager : JniRuntime.JniValueManager
 {
 	const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 
-	Dictionary<int, List<IJavaPeerable>>?   RegisteredInstances = new Dictionary<int, List<IJavaPeerable>>();
+	Dictionary<int, List<GCHandle>>?   RegisteredInstances = new ();
 
-	internal ManagedValueManager ()
+	internal unsafe ManagedValueManager ()
 	{
+		var mark_cross_references_ftn = RuntimeNativeMethods.clr_initialize_gc_bridge (&BridgeProcessingFinished);
+		JavaMarshal.Initialize (mark_cross_references_ftn);
 	}
 
 	public override void WaitForGCBridgeProcessing ()
@@ -35,7 +38,7 @@ public override void CollectPeers ()
 		if (RegisteredInstances == null)
 			throw new ObjectDisposedException (nameof (ManagedValueManager));
 
-		var peers = new List<IJavaPeerable> ();
+		var peers = new List<GCHandle> ();
 
 		lock (RegisteredInstances) {
 			foreach (var ps in RegisteredInstances.Values) {
@@ -48,7 +51,8 @@ public override void CollectPeers ()
 		List<Exception>? exceptions = null;
 		foreach (var peer in peers) {
 			try {
-				peer.Dispose ();
+				if (peer.Target is IDisposable disposable)
+					disposable.Dispose ();
 			}
 			catch (Exception e) {
 				exceptions = exceptions ?? new List<Exception> ();
@@ -74,33 +78,35 @@ public override void AddPeer (IJavaPeerable value)
 		}
 		int key = value.JniIdentityHashCode;
 		lock (RegisteredInstances) {
-			List<IJavaPeerable>? peers;
+			List<GCHandle>? peers;
 			if (!RegisteredInstances.TryGetValue (key, out peers)) {
-				peers = new List<IJavaPeerable> () {
-					value,
+				peers = new List<GCHandle> () {
+					CreateReferenceTrackingHandle (value)
 				};
 				RegisteredInstances.Add (key, peers);
 				return;
 			}
 
 			for (int i = peers.Count - 1; i >= 0; i--) {
 				var p   = peers [i];
-				if (!JniEnvironment.Types.IsSameObject (p.PeerReference, value.PeerReference))
+				if (p.Target is not IJavaPeerable peer)
+					continue;
+				if (!JniEnvironment.Types.IsSameObject (peer.PeerReference, value.PeerReference))
 					continue;
 				if (Replaceable (p)) {
-					peers [i] = value;
+					peers [i] = CreateReferenceTrackingHandle (value);
 				} else {
-					WarnNotReplacing (key, value, p);
+					WarnNotReplacing (key, value, peer);
 				}
 				return;
 			}
-			peers.Add (value);
+			peers.Add (CreateReferenceTrackingHandle (value));
 		}
 	}
 
-	static bool Replaceable (IJavaPeerable peer)
+	static bool Replaceable (GCHandle handle)
 	{
-		if (peer == null)
+		if (handle.Target is not IJavaPeerable peer)
 			return true;
 		return peer.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable);
 	}
@@ -132,14 +138,14 @@ void WarnNotReplacing (int key, IJavaPeerable ignoreValue, IJavaPeerable keepVal
 		int key = GetJniIdentityHashCode (reference);
 
 		lock (RegisteredInstances) {
-			List<IJavaPeerable>? peers;
+			List<GCHandle>? peers;
 			if (!RegisteredInstances.TryGetValue (key, out peers))
 				return null;
 
 			for (int i = peers.Count - 1; i >= 0; i--) {
 				var p = peers [i];
-				if (JniEnvironment.Types.IsSameObject (reference, p.PeerReference))
-					return p;
+				if (p.Target is IJavaPeerable peer && JniEnvironment.Types.IsSameObject (reference, peer.PeerReference))
+					return peer;
 			}
 			if (peers.Count == 0)
 				RegisteredInstances.Remove (key);
@@ -157,14 +163,15 @@ public override void RemovePeer (IJavaPeerable value)
 
 		int key = value.JniIdentityHashCode;
 		lock (RegisteredInstances) {
-			List<IJavaPeerable>? peers;
+			List<GCHandle>? peers;
 			if (!RegisteredInstances.TryGetValue (key, out peers))
 				return;
 
 			for (int i = peers.Count - 1; i >= 0; i--) {
 				var p   = peers [i];
-				if (object.ReferenceEquals (value, p)) {
+				if (object.ReferenceEquals (value, p.Target)) {
 					peers.RemoveAt (i);
+					FreeHandle (p);
 				}
 			}
 			if (peers.Count == 0)
@@ -251,13 +258,41 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 			var peers = new List<JniSurfacedPeerInfo> (RegisteredInstances.Count);
 			foreach (var e in RegisteredInstances) {
 				foreach (var p in e.Value) {
-					peers.Add (new JniSurfacedPeerInfo (e.Key, new WeakReference<IJavaPeerable> (p)));
+					if (p.Target is not IJavaPeerable peer)
+						continue;
+					peers.Add (new JniSurfacedPeerInfo (e.Key, new WeakReference<IJavaPeerable> (peer)));
 				}
 			}
 			return peers;
 		}
 	}
 
+	static GCHandle CreateReferenceTrackingHandle (IJavaPeerable value) =>
+		JavaMarshal.CreateReferenceTrackingHandle (value, value.JniObjectReferenceControlBlock);
+
+	static unsafe void FreeHandle (GCHandle handle)
+	{
+		IntPtr context = JavaMarshal.GetContext (handle);
+		NativeMemory.Free ((void*) context);
+	}
+
+	[UnmanagedCallersOnly]
+	internal static unsafe void BridgeProcessingFinished (MarkCrossReferences* mcr)
+	{
+		List<GCHandle> handlesToFree = [];
+		for (int i = 0; i < mcr->ComponentsLen; i++)
+		{
+			for (int j = 0; j < mcr->Components [i].Count; j++)
+			{
+				IntPtr *pContext = (IntPtr*) mcr->Components [i].Context [j];
+				handlesToFree.Add (GCHandle.FromIntPtr (*pContext));
+				NativeMemory.Free (pContext);
+			}
+		}
+
+		JavaMarshal.FinishCrossReferenceProcessing (mcr, CollectionsMarshal.AsSpan (handlesToFree));
+	}
+
 	const   BindingFlags    ActivationConstructorBindingFlags   = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
 	static  readonly    Type[]  XAConstructorSignature  = new Type [] { typeof (IntPtr), typeof (JniHandleOwnership) };

src/Mono.Android/Mono.Android.csproj

@@ -113,6 +113,7 @@
   <Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
   <Import Project="Mono.Android.targets" />
   <Import Project="..\..\build-tools\scripts\JavaCallableWrappers.targets" />
+  <Import Project="..\..\build-tools\scripts\custom-runtime.targets" />
   <Import Project="$(IntermediateOutputPath)mcw\Mono.Android.projitems" Condition="Exists('$(IntermediateOutputPath)mcw\Mono.Android.projitems')" />
 
 <ItemGroup>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs

@@ -391,6 +391,17 @@ public void CopyNuGetConfig (string relativeDirectory)
 					doc.Save (projNugetConfig);
 				}
 			}
+
+			// Copy packages folder
+			var repoPackages = Path.Combine (XABuildPaths.TopDirectory, "packages");
+			var projPackages = Path.Combine (Root, relativeDirectory, "packages");
+			if (Directory.Exists (repoPackages)) {
+				Directory.CreateDirectory (projPackages);
+				foreach (var package in Directory.GetFiles (repoPackages, "*.nupkg")) {
+					var destination = Path.Combine (projPackages, Path.GetFileName (package));
+					File.Copy (package, destination, overwrite: true);
+				}
+			}
 		}
 
 		/// <summary>

src/native/clr/host/CMakeLists.txt

@@ -29,6 +29,7 @@ set(XAMARIN_NET_ANDROID_STATIC_LIB "${XAMARIN_NET_ANDROID_LIB}-static")
 
 set(XAMARIN_MONODROID_SOURCES
   assembly-store.cc
+  gc-bridge.cc
   host.cc
   host-jni.cc
   host-util.cc