From 3f8b9221226e2fbb4fd5ba1cb5846002d5c7066b Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Sat, 30 Sep 2023 12:02:32 -0500
Subject: [PATCH] mono update: Override assembly name when the assembly is
 loaded through an AssemblyResolve handler.

---
 mono                                | 2 +-
 mono.make                           | 1 +
 tools/run-tests/windows-passing.txt | 1 +
 tools/run-tests/wine-passing.txt    | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mono b/mono
index 83bbc8c6..6e566a65 160000
--- a/mono
+++ b/mono
@@ -1 +1 @@
-Subproject commit 83bbc8c61b7acaaad54dcc26d4e0b58e10294e49
+Subproject commit 6e566a6526a68d52a62d5c4181786fae8f989d4d
diff --git a/mono.make b/mono.make
index c8e1b68e..54326e14 100644
--- a/mono.make
+++ b/mono.make
@@ -98,6 +98,7 @@ tests-runtime-$(1): $$(BUILDDIR)/mono-unix/mono/mini/.built-tests $$(BUILDDIR)/m
 	cp $$(BUILDDIR)/mono-unix/mono/tests/assembly-load-dir1/Lib*.dll $$(TESTS_OUTDIR)/tests-$(1)/assembly-load-dir1
 	mkdir -p $$(TESTS_OUTDIR)/tests-$(1)/assembly-load-dir2
 	cp $$(BUILDDIR)/mono-unix/mono/tests/assembly-load-dir2/*.dll $$(TESTS_OUTDIR)/tests-$(1)/assembly-load-dir2
+	$$(CP_R) $$(BUILDDIR)/mono-unix/mono/tests/assemblyresolve_deps $$(TESTS_OUTDIR)/tests-$(1)/
 ifeq ($(1),x86)
 	cp $$(BUILDDIR)/mono-unix/builtin-types-32.exe $$(TESTS_OUTDIR)/tests-$(1)/builtin-types.exe
 endif
diff --git a/tools/run-tests/windows-passing.txt b/tools/run-tests/windows-passing.txt
index b0874171..d0fa2c1c 100644
--- a/tools/run-tests/windows-passing.txt
+++ b/tools/run-tests/windows-passing.txt
@@ -76528,6 +76528,7 @@ MonoTests.System.Security.Cryptography.X509Certificates.X509StoreTest:Remove_Nul
 MonoTests.System.Security.Cryptography.X509Certificates.X509StoreTest:Remove_OpenReadOnly_Existing
 MonoTests.System.Security.Cryptography.X509Certificates.X509StoreTest:Remove_OpenReadOnly_Unexisting
 marshalsig
+assemblyresolve_event8
 # unreliable:
 x86.thread-exit
 MonoTests.System.Threading.Tasks.TaskTests:DoubleWaitTest
diff --git a/tools/run-tests/wine-passing.txt b/tools/run-tests/wine-passing.txt
index ec3f9660..130a20f1 100644
--- a/tools/run-tests/wine-passing.txt
+++ b/tools/run-tests/wine-passing.txt
@@ -74145,6 +74145,7 @@ MonoTests.System.ServiceModel.NetPeerTcpBindingTest:DefaultValues
 MonoTests.System.ServiceModel.NetPeerTcpBindingTest
 assemblysearchgacbeforepath
 marshalsig
+assemblyresolve_event8
 # definitely unreliable:
 delegate2
 x86_64.MonoTests.System.Threading.ThreadLocalTests:DisposeOnThreadExit