Enable marshal methods support by default

Directory.Build.props

@@ -27,10 +27,6 @@
     <DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">
-    <_EnableMarshalMethods>NoThanks</_EnableMarshalMethods> <!-- set to YesPlease to enable -->
-  </PropertyGroup>
-
   <PropertyGroup>
     <ProductVersion>13.1.99</ProductVersion>
     <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.

Xamarin.Android.sln

@@ -92,6 +92,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Android", "src\Mono.An
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Android.Export", "src\Mono.Android.Export\Mono.Android.Export.csproj", "{B8105878-D423-4159-A3E7-028298281EC6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Android.Runtime", "src\Mono.Android.Runtime\Mono.Android.Runtime.csproj", "{43564FB3-0F79-4FF4-A2B0-B1637072FF01}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Android.Build.BaseTasks", "external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj", "{3DE17662-DCD6-4F49-AF06-D39AACC8649A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.AndroidSdk", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}"
@@ -296,6 +298,12 @@ Global
 		{B8105878-D423-4159-A3E7-028298281EC6}.Debug|AnyCPU.Build.0 = Debug|Any CPU
 		{B8105878-D423-4159-A3E7-028298281EC6}.Release|AnyCPU.ActiveCfg = Release|Any CPU
 		{B8105878-D423-4159-A3E7-028298281EC6}.Release|AnyCPU.Build.0 = Release|Any CPU
+
+		{43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Release|AnyCPU.Build.0 = Release|Any CPU
+
 		{3DE17662-DCD6-4F49-AF06-D39AACC8649A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
 		{3DE17662-DCD6-4F49-AF06-D39AACC8649A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
 		{3DE17662-DCD6-4F49-AF06-D39AACC8649A}.Release|AnyCPU.ActiveCfg = Release|Any CPU
@@ -456,6 +464,7 @@ Global
 		{73DF9E10-E933-4222-B8E1-F4536FFF9FAD} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{66CF299A-CE95-4131-BCD8-DB66E30C4BF7} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 		{B8105878-D423-4159-A3E7-028298281EC6} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
+		{43564FB3-0F79-4FF4-A2B0-B1637072FF01} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 		{3DE17662-DCD6-4F49-AF06-D39AACC8649A} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 		{1E5501E8-49C1-4659-838D-CC9720C5208F} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}

build-tools/automation/azure-pipelines.yaml

@@ -1203,6 +1203,7 @@ stages:
       clean: all
     variables:
       EnableRegressionTest: true
+      AndroidEnableMarshalMethods: false
     steps:
     - checkout: uitools
       clean: true

build-tools/automation/yaml-templates/run-designer-tests.yml

@@ -62,7 +62,10 @@ steps:
   displayName: 'Copy binlogs'
   inputs:
     sourceFolder: ${{ parameters.designerSourcePath }}/Xamarin.Designer.Android
-    contents: '**/*.binlog'
+    contents: |
+      **/*.binlog
+      **/hs*.log
+      **/hs*.mdmp
     targetFolder: $(Build.ArtifactStagingDirectory)/designer-binlogs
     overWrite: true
     flattenFolders: true

build-tools/create-packs/Microsoft.Android.Ref.proj

@@ -33,6 +33,7 @@ by projects that use the Microsoft.Android framework in .NET 6+.
     <ItemGroup>
       <_AndroidRefPackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-net7.0\ref\Java.Interop.dll" />
       <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)ref\Mono.Android.dll" />
+      <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)ref\Mono.Android.Runtime.dll" />
       <!-- Always include stable Mono.Android.Export.dll -->
       <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETOutputRoot)$(AndroidLatestStableApiLevel)\ref\Mono.Android.Export.dll" />
       <FrameworkListFileClass Include="@(_AndroidRefPackAssemblies->'%(Filename)%(Extension)')" Profile="Android" />

build-tools/create-packs/Microsoft.Android.Runtime.proj

@@ -35,6 +35,7 @@ projects that use the Microsoft.Android framework in .NET 6+.
     <ItemGroup>
       <_AndroidRuntimePackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)Java.Interop.dll" />
       <_AndroidRuntimePackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)Mono.Android.dll" />
+      <_AndroidRuntimePackAssemblies Include="$(_MonoAndroidNETDefaultOutDir)Mono.Android.Runtime.dll" />
       <!-- Always include stable Mono.Android.Export.dll -->
       <_AndroidRuntimePackAssemblies Include="$(_MonoAndroidNETOutputRoot)$(AndroidLatestStableApiLevel)\Mono.Android.Export.dll" />
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so" />

build-tools/scripts/JavaCallableWrappers.targets

@@ -23,7 +23,6 @@
     />
     <ItemGroup>
       <_JavaSources Include="$(IntermediateOutputPath)jcw\src\**\*.java" />
-      <_JavaSources Include="$(JavaInteropSourceDirectory)\src\Java.Interop\java\com\xamarin\**\*.java" />
     </ItemGroup>
     <WriteLinesToFile
         File="$(IntermediateOutputPath)jcw/classes.txt"

build-tools/scripts/TestApks.targets

@@ -103,7 +103,7 @@
         WriteOutputAsMessage="True"
     />
     <Xamarin.Android.Tools.BootstrapTasks.Adb
-        Arguments="$(_AdbTarget) shell setprop debug.mono.log timing"
+        Arguments="$(_AdbTarget) shell setprop debug.mono.log default,assembly,timing=bare"
         IgnoreExitCode="True"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"

src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.Runtime.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<linker>
+	<assembly fullname="Mono.Android.Runtime">
+		<type fullname="Android.Runtime.LogLevel" />
+		<type fullname="Android.Runtime.LogCategories" />
+        <type fullname="Android.Runtime.AndroidRuntimeInternal">
+          <method name="InitializeUnhandledExceptionMethod" />
+          <method name="WaitForBridgeProcessing" />
+        </type>
+        <type fullname="Android.Runtime.AndroidEnvironmentInternal">
+          <method name="UnhandledException" />
+        </type>
+	</assembly>
+</linker>

src/Microsoft.Android.Sdk.ILLink/PreserveLists/Mono.Android.xml

@@ -7,17 +7,17 @@
 		<type fullname="Android.Runtime.InputStreamInvoker" preserve="methods" />
 		<type fullname="Android.Runtime.JNIEnv">
 			<method name="Exit" />
-			<method name="Initialize" />
 			<method name="PropagateUncaughtException" />
+		</type>
+		<type fullname="Android.Runtime.JNIEnvInit">
+			<method name="Initialize" />
 			<method name="RegisterJniNatives" />
 		</type>
 		<type fullname="Android.Runtime.JNINativeWrapper" />
 		<type fullname="Android.Runtime.JObjectRefType" />
 		<type fullname="Android.Runtime.JValue" />
 		<type fullname="Android.Runtime.JniHandleOwnership" />
 		<type fullname="Android.Runtime.Logger" />
-		<type fullname="Android.Runtime.LogLevel" />
-		<type fullname="Android.Runtime.LogCategories" />
 		<type fullname="Android.Runtime.NamespaceMappingAttribute" />
 		<type fullname="Android.Runtime.OutputStreamAdapter" preserve="methods" />
 		<type fullname="Android.Runtime.OutputStreamInvoker" preserve="methods" />

src/Mono.Android.Runtime/Android.Runtime/AndroidEnvironmentInternal.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace Android.Runtime
+{
+	internal static class AndroidEnvironmentInternal
+	{
+		internal static Action<Exception>? UnhandledExceptionHandler;
+
+		internal static void UnhandledException (Exception e)
+		{
+			if (UnhandledExceptionHandler == null) {
+				return;
+			}
+
+			UnhandledExceptionHandler (e);
+		}
+	}
+}

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

@@ -0,0 +1,111 @@
+<Project>
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="..\..\Configuration.props" />
+  <Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
+
+  <PropertyGroup>
+    <TargetFrameworks>$(DotNetTargetFramework)</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
+    <LangVersion>10</LangVersion>
+    <NoStdLib>true</NoStdLib>
+    <Nullable>enable</Nullable>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <SignAssembly>true</SignAssembly>
+
+    <!-- Ignore "unused member" warnings from code that originates from Mono.CodeGeneration -->
+    <NoWarn>$(NoWarn);CS0169;CS0414;CS0649</NoWarn>
+
+    <DefineConstants>$(DefineConstants);INSIDE_MONO_ANDROID_RUNTIME;JAVA_INTEROP</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>$(_MonoAndroidNETDefaultOutDir)</OutputPath>
+  </PropertyGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <!-- Only build the .NET 6+ version of 'Mono.Android.Export.dll' for the latest stable Android version. -->
+  <PropertyGroup Condition=" '$(AndroidApiLevel)' != '$(AndroidLatestStableApiLevel)' ">
+    <BuildDependsOn></BuildDependsOn>
+  </PropertyGroup>
+
+  <!-- Copy .NET ref/runtime assemblies to bin/$(Configuration)/dotnet/packs folder -->
+  <PropertyGroup Condition=" '$(AndroidApiLevel)' == '$(AndroidLatestStableApiLevel)' ">
+    <BuildDependsOn>
+      $(BuildDependsOn);
+      _CopyToPackDirs;
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
+    <Compile Include="..\Mono.Android\Android.Runtime\AndroidRuntimeInternal.cs" />
+    <Compile Include="..\Mono.Android\Android.Runtime\LogCategories.cs" />
+    <Compile Include="..\Mono.Android\Android.Runtime\LogLevel.cs" />
+    <Compile Include="..\Mono.Android\Android.Runtime\RuntimeConstants.cs" />
+    <Compile Include="..\Mono.Android\Android.Runtime\RuntimeNativeMethods.cs" />
+    <Compile Include="Android.Runtime\AndroidEnvironmentInternal.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop\Java.Interop.csproj" />
+  </ItemGroup>
+
+   <!-- Creates 'AssemblyInfo.cs' with appropriate version information -->
+  <Target Name="_BuildAssemblyInfo_cs"
+      DependsOnTargets="GetXAVersionInfo"
+      BeforeTargets="CoreCompile"
+      Condition="!Exists ('$(IntermediateOutputPath)AssemblyInfo.cs')"
+      Inputs="Properties\AssemblyInfo.cs.in"
+      Outputs="$(IntermediateOutputPath)AssemblyInfo.cs">
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid10' ">
+      <_PackageVersion>$(ProductVersion)</_PackageVersion>
+      <_PackageVersionBuild>$(XAVersionCommitCount)</_PackageVersionBuild>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(TargetFramework)' != 'monoandroid10' ">
+      <_PackageVersion>$(AndroidPackVersion)</_PackageVersion>
+      <_PackageVersionBuild>$(PackVersionCommitCount)</_PackageVersionBuild>
+    </PropertyGroup>
+    <ReplaceFileContents
+        SourceFile="Properties\AssemblyInfo.cs.in"
+        DestinationFile="$(IntermediateOutputPath)AssemblyInfo.cs"
+        Replacements="@PACKAGE_VERSION@=$(_PackageVersion);@PACKAGE_VERSION_BUILD@=$(_PackageVersionBuild);@PACKAGE_HEAD_REV@=$(XAVersionHash);@PACKAGE_HEAD_BRANCH@=$(XAVersionBranch);@API_LEVEL@=$(AndroidApiLevel);@MIN_API_LEVEL@=$(AndroidMinimumDotNetApiLevel)">
+    </ReplaceFileContents>
+  </Target>
+
+  <Target Name="_CopyToPackDirs" >
+    <Copy
+        SourceFiles="$(OutputPath)ref\Mono.Android.Runtime.dll"
+        DestinationFolder="$(MicrosoftAndroidRefPackDir)"
+        SkipUnchangedFiles="true"
+    />
+    <Copy
+        SourceFiles="$(OutputPath)Mono.Android.Runtime.dll"
+        DestinationFolder="$(MicrosoftAndroidArmPackDir)lib\$(DotNetTargetFramework)"
+        SkipUnchangedFiles="true"
+    />
+    <Copy
+        SourceFiles="$(OutputPath)Mono.Android.Runtime.dll"
+        DestinationFolder="$(MicrosoftAndroidArm64PackDir)lib\$(DotNetTargetFramework)"
+        SkipUnchangedFiles="true"
+    />
+    <Copy
+        SourceFiles="$(OutputPath)Mono.Android.Runtime.dll"
+        DestinationFolder="$(MicrosoftAndroidx86PackDir)lib\$(DotNetTargetFramework)"
+        SkipUnchangedFiles="true"
+    />
+    <Copy
+        SourceFiles="$(OutputPath)Mono.Android.Runtime.dll"
+        DestinationFolder="$(MicrosoftAndroidx64PackDir)lib\$(DotNetTargetFramework)"
+        SkipUnchangedFiles="true"
+    />
+  </Target>
+
+</Project>

src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in

@@ -0,0 +1,21 @@
+//
+// AssemblyInfo.cs.in
+//
+// Authors:
+//   Jonathan Pryor ([email protected])
+//
+// Copyright 2014 Xamarin, Inc.
+// Copyright 2016 Microsoft Corporation.
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.Versioning;
+
+[assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")]
+[assembly: AssemblyTitle ("Mono.Android.Runtime.dll")]
+[assembly: AssemblyProduct ("Xamarin.Android")]
+[assembly: AssemblyCompany ("Microsoft Corporation")]
+[assembly: TargetPlatform("Android@[email protected]")]
+[assembly: SupportedOSPlatform("Android@[email protected]")]
+
+[assembly: InternalsVisibleTo("Mono.Android, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]

src/Mono.Android/Android.App/SyncContext.cs

@@ -18,7 +18,7 @@ static bool EnsureLooper ([NotNullWhen (true)]Looper? looper, SendOrPostCallback
 		{
 			if (looper == null) {
 				var message = $"No Android message loop is available. Skipping invocation of `{d.Method.DeclaringType?.FullName}.{d.Method.Name}`!";
-				if (JNIEnv.IsRunningOnDesktop)
+				if (JNIEnvInit.IsRunningOnDesktop)
 					message += " Using `await` when running on the Android Designer is not currently supported. Please use the `View.IsInEditMode` property.";
 				Logger.Log (LogLevel.Error, "monodroid-synccontext", message);
 				return false;

src/Mono.Android/Android.Runtime/AndroidEnvironment.cs

@@ -264,17 +264,14 @@ static void GetDisplayDPI (out float x_dpi, out float y_dpi)
 		//
 		static string GetDefaultTimeZone ()
 		{
-			IntPtr id = _monodroid_timezone_get_default_id ();
+			IntPtr id = RuntimeNativeMethods._monodroid_timezone_get_default_id ();
 			try {
 				return Marshal.PtrToStringAnsi (id)!;
 			} finally {
-				JNIEnv.monodroid_free (id);
+				RuntimeNativeMethods.monodroid_free (id);
 			}
 		}
 
-		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		static extern IntPtr _monodroid_timezone_get_default_id ();
-
 		// This is invoked by
 		// mscorlib.dll!System.AndroidPlatform.GetDefaultSyncContext()
 		// DO NOT REMOVE
@@ -293,35 +290,26 @@ static string GetDefaultTimeZone ()
 		// These are invoked by
 		// System.dll!System.AndroidPlatform.getifaddrs
 		// DO NOT REMOVE
-		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		static extern int _monodroid_getifaddrs (out IntPtr ifap);
-
 		static int GetInterfaceAddresses (out IntPtr ifap)
 		{
-			return _monodroid_getifaddrs (out ifap);
+			return RuntimeNativeMethods._monodroid_getifaddrs (out ifap);
 		}
 
 		// These are invoked by
 		// System.dll!System.AndroidPlatform.freeifaddrs
 		// DO NOT REMOVE
-		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-                static extern void _monodroid_freeifaddrs (IntPtr ifap);
-
 		static void FreeInterfaceAddresses (IntPtr ifap)
 		{
-			_monodroid_freeifaddrs (ifap);
+			RuntimeNativeMethods._monodroid_freeifaddrs (ifap);
 		}
 
-		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		static extern void _monodroid_detect_cpu_and_architecture (ref ushort built_for_cpu, ref ushort running_on_cpu, ref byte is64bit);
-
 		static void DetectCPUAndArchitecture (out ushort builtForCPU, out ushort runningOnCPU, out bool is64bit)
 		{
 			ushort built_for_cpu = 0;
 			ushort running_on_cpu = 0;
 			byte _is64bit = 0;
 
-			_monodroid_detect_cpu_and_architecture (ref built_for_cpu, ref running_on_cpu, ref _is64bit);
+			RuntimeNativeMethods._monodroid_detect_cpu_and_architecture (ref built_for_cpu, ref running_on_cpu, ref _is64bit);
 			builtForCPU = built_for_cpu;
 			runningOnCPU = running_on_cpu;
 			is64bit = _is64bit != 0;