From 3590070f6b672bbf7e1b866e9f9654ad02cb54ce Mon Sep 17 00:00:00 2001
From: Sebastien Pouliot <sebastien.pouliot@gmail.com>
Date: Fri, 18 Jun 2021 13:10:48 -0400
Subject: [PATCH] Revert "[tests] Preserve a required method in
 System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

This reverts commit 29727d6a8da87f4e9f0db5bb7f8e24929078332d.

https://github.com/dotnet/runtime/issues/46908 was fixed and the other part of the workaround was removed in PR#11958
---
 .../dotnet/MacCatalyst/monotouch-test.csproj             | 2 --
 tests/monotouch-test/dotnet/extra-linker-defs.xml        | 9 ---------
 tests/monotouch-test/dotnet/iOS/monotouch-test.csproj    | 6 ------
 tests/monotouch-test/dotnet/macOS/monotouch-test.csproj  | 2 --
 tests/monotouch-test/dotnet/tvOS/monotouch-test.csproj   | 2 --
 5 files changed, 21 deletions(-)
 delete mode 100644 tests/monotouch-test/dotnet/extra-linker-defs.xml

diff --git a/tests/monotouch-test/dotnet/MacCatalyst/monotouch-test.csproj b/tests/monotouch-test/dotnet/MacCatalyst/monotouch-test.csproj
index 52993feb16fa..9cadcf18bbeb 100644
--- a/tests/monotouch-test/dotnet/MacCatalyst/monotouch-test.csproj
+++ b/tests/monotouch-test/dotnet/MacCatalyst/monotouch-test.csproj
@@ -32,8 +32,6 @@
     <None Include="..\..\Entitlements.plist" />
     <None Include="..\..\app.config" />
     <None Include="..\..\EmptyNib.xib" />
-
-    <LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/monotouch-test/dotnet/extra-linker-defs.xml b/tests/monotouch-test/dotnet/extra-linker-defs.xml
deleted file mode 100644
index f1257eb08ad7..000000000000
--- a/tests/monotouch-test/dotnet/extra-linker-defs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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 3561dce879d4..3ad41e6422c8 100644
--- a/tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
+++ b/tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
@@ -27,17 +27,11 @@
     <PackageReference Include="System.Json" Version="4.7.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="..\..\Entitlements.plist" />
     <None Include="..\..\app.config" />
     <None Include="..\..\EmptyNib.xib" />
-
-    <LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/monotouch-test/dotnet/macOS/monotouch-test.csproj b/tests/monotouch-test/dotnet/macOS/monotouch-test.csproj
index 2ec163a69cb9..f87ca5a31b5c 100644
--- a/tests/monotouch-test/dotnet/macOS/monotouch-test.csproj
+++ b/tests/monotouch-test/dotnet/macOS/monotouch-test.csproj
@@ -33,8 +33,6 @@
     <None Include="..\..\Entitlements.plist" />
     <None Include="..\..\app.config" />
     <None Include="..\..\EmptyNib.xib" />
-
-    <LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/monotouch-test/dotnet/tvOS/monotouch-test.csproj b/tests/monotouch-test/dotnet/tvOS/monotouch-test.csproj
index 1d483e9d3be9..511a3324db42 100644
--- a/tests/monotouch-test/dotnet/tvOS/monotouch-test.csproj
+++ b/tests/monotouch-test/dotnet/tvOS/monotouch-test.csproj
@@ -32,8 +32,6 @@
     <None Include="..\..\Entitlements.plist" />
     <None Include="..\..\app.config" />
     <None Include="..\..\EmptyNib.xib" />
-
-    <LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
   </ItemGroup>
 
   <ItemGroup>