mono update: Override assembly name when the assembly is loaded throu…

…gh an AssemblyResolve handler.
madewokherd · Sep 30, 2023 · 3f8b922 · 3f8b922
1 parent e11ab65
commit 3f8b922
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/mono b/mono
diff --git 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
@@ -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
@@ -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
+38 −3		mono/metadata/appdomain.c
+3 −0		mono/metadata/assembly-internals.h
+27 −0		mono/metadata/assembly.c
+1 −0		mono/metadata/domain-internals.h
+13 −0		mono/metadata/domain.c
+7 −0		mono/metadata/metadata-internals.h
+7 −0		mono/tests/Makefile.am
+39 −0		mono/tests/assemblyresolve_event8.cs
+12 −0		mono/tests/assemblyresolve_event8_helper.cs