Skip to content

Commit c6ef760

Browse files
authored
Fix #48579 (#49387)
1 parent e3f0144 commit c6ef760

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/tests/Loader/ContextualReflection/ContextualReflection.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -729,14 +729,14 @@ void TestActivatorCreateInstance(bool isolated)
729729
void TestDefineDynamicAssembly(bool collectibleContext, AssemblyBuilderAccess assemblyBuilderAccess)
730730
{
731731
AssemblyLoadContext assemblyLoadContext = collectibleContext ? new AssemblyLoadContext("DynamicAssembly Collectable context", true) : AssemblyLoadContext.Default;
732-
AssemblyName dynamicAssemblyName = new AssemblyName("DynamicAssembly");
732+
AssemblyBuilder assemblyBuilder;
733733

734734
using (assemblyLoadContext.EnterContextualReflection())
735735
{
736-
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(dynamicAssemblyName, assemblyBuilderAccess);
736+
assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName($"DynamicAssembly_{Guid.NewGuid():N}"), assemblyBuilderAccess);
737737
}
738738

739-
Assert.IsTrue(assemblyLoadContext.Assemblies.Any(a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), dynamicAssemblyName)));
739+
Assert.IsTrue(assemblyLoadContext.Assemblies.Any(a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyBuilder.GetName())));
740740
}
741741

742742
void TestMockAssemblyThrows()
@@ -752,9 +752,8 @@ public void RunTests()
752752
VerifyUsingStatementContextualReflectionUsage();
753753
VerifyBadContextualReflectionUsage();
754754

755-
// TestDynamicAssembly() disabled due to https://github.com/dotnet/runtime/issues/48579
756-
//TestDynamicAssembly(true);
757-
//TestDynamicAssembly(false);
755+
TestDynamicAssembly(true);
756+
TestDynamicAssembly(false);
758757

759758
RunTests(isolated : false);
760759
alcProgramInstance.RunTestsIsolated();

0 commit comments

Comments
 (0)