[tests] Preserve a required method in System.Private.CoreLib to work …

…around a bug in .NET 6. (xamarin#10426) Ref: dotnet/runtime#46908.
spouliot · Jan 15, 2021 · 29727d6 · 29727d6
1 parent 24331f3
commit 29727d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/tests/monotouch-test/dotnet/extra-linker-defs.xml 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
@@ -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>