Skip to content

Do not use ALC name for AssemblyName #82754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2023
Merged

Do not use ALC name for AssemblyName #82754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions ...libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,9 @@ private sealed class ProxyAssembly
[RequiresDynamicCode("Defining a dynamic assembly requires generating code at runtime")]
public ProxyAssembly(AssemblyLoadContext alc)
{
string name;
if (alc == AssemblyLoadContext.Default)
{
name = "ProxyBuilder";
}
else
{
string? alcName = alc.Name;
name = string.IsNullOrEmpty(alcName) ? $"DispatchProxyTypes.{alc.GetHashCode()}" : $"DispatchProxyTypes.{alcName}";
}
AssemblyBuilderAccess builderAccess =
alc.IsCollectible ? AssemblyBuilderAccess.RunAndCollect : AssemblyBuilderAccess.Run;
_ab = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(name), builderAccess);
_ab = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("ProxyBuilder"), builderAccess);
_mb = _ab.DefineDynamicModule("testmod");
}

Expand Down
19 changes: 19 additions & 0 deletions src/libraries/System.Reflection.DispatchProxy/tests/DispatchProxyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,25 @@ static object CreateTestDispatchProxy(Type type, bool useGenericCreate)
}
}

[Fact]
public static void Test_Multiple_AssemblyLoadContextsWithBadName()
{
if (typeof(DispatchProxyTests).Assembly.Location == "")
return;

Assembly assembly = Assembly.LoadFile(typeof(DispatchProxyTests).Assembly.Location);
Type type = assembly.GetType(typeof(DispatchProxyTests).FullName);
MethodInfo method = type.GetMethod(nameof(Demo), BindingFlags.NonPublic | BindingFlags.Static);
Assert.True((bool)method.Invoke(null, null));
}

internal static bool Demo()
{
TestType_IHelloService proxy = DispatchProxy.Create<TestType_IHelloService, InternalInvokeProxy>();
proxy.Hello("Hello");
return true;
}

private static TInterface CreateHelper<TInterface, TProxy>(bool useGenericCreate) where TProxy : DispatchProxy
{
if (useGenericCreate)
Expand Down