From 29727d6a8da87f4e9f0db5bb7f8e24929078332d Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 15 Jan 2021 16:39:44 +0100
Subject: [PATCH] [tests] Preserve a required method in System.Private.CoreLib
 to work around a bug in .NET 6. (#10426)

Ref: https://github.com/dotnet/runtime/issues/46908.
---
 tests/monotouch-test/dotnet/extra-linker-defs.xml     | 9 +++++++++
 tests/monotouch-test/dotnet/iOS/monotouch-test.csproj | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 tests/monotouch-test/dotnet/extra-linker-defs.xml

diff --git a/tests/monotouch-test/dotnet/extra-linker-defs.xml b/tests/monotouch-test/dotnet/extra-linker-defs.xml
new file mode 100644
index 000000000000..f1257eb08ad7
--- /dev/null
+++ b/tests/monotouch-test/dotnet/extra-linker-defs.xml
@@ -0,0 +1,9 @@
+<linker>
+	<assembly fullname="System.Private.CoreLib">
+		<type fullname="System.Runtime.Loader.AssemblyLoadContext">
+			<!-- https://github.com/dotnet/runtime/issues/46908 -->
+			<!-- native-library.c: netcore_resolve_with_resolving_event () -->
+			<method name="MonoResolveUnmanagedDllUsingEvent" />
+		</type>
+	</assembly>
+</linker>
diff --git a/tests/monotouch-test/dotnet/iOS/monotouch-test.csproj b/tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
index 0950735626ae..cbafe6a62db9 100644
--- a/tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
+++ b/tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
@@ -16,6 +16,7 @@
     <DefineConstants Condition="'$(Platform)' == 'iPhoneSimulator'">$(DefineConstants);DYNAMIC_REGISTRAR</DefineConstants>
     <DefineConstants Condition="'$(Platform)' != 'iPhoneSimulator'">$(DefineConstants);DEVICE</DefineConstants>
     <RootTestsDirectory>..\..\..</RootTestsDirectory>
+    <MtouchExtraArgs>-xml=${ProjectDir}/../extra-linker-defs.xml</MtouchExtraArgs>
   </PropertyGroup>
 
   <ItemGroup>