Skip to content

Commit cc35b92

Browse files
authored
fix the bug that incorrect name used when resolving preload assemblies (#12187)
* fix the bug that incorrect name is used when resolving preload assemblies * remove unnecessary file
1 parent 1aa68ca commit cc35b92

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Accounts/Accounts/Utilities/CustomAssemblyResolver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ public static void Initialize()
3030
}
3131

3232
/// <summary>
33-
/// When the resolution of an assembly fails, if it's Newtonsoft.Json 9, redirect to 10
33+
/// When the resolution of an assembly fails, if will try to redirect to the higher version
3434
/// </summary>
3535
public static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
3636
{
3737
try
3838
{
3939
AssemblyName name = new AssemblyName(args.Name);
40-
if (NetFxPreloadAssemblies.TryGetValue(args.Name, out Version version))
40+
if (NetFxPreloadAssemblies.TryGetValue(name.Name, out Version version))
4141
{
4242
if (version >= name.Version && version.Major == name.Version.Major)
4343
{
44-
string requiredAssembly = Path.Combine(PreloadAssemblyFolder, $"{args.Name}.dll");
44+
string requiredAssembly = Path.Combine(PreloadAssemblyFolder, $"{name.Name}.dll");
4545
return Assembly.LoadFrom(requiredAssembly);
4646
}
4747
}

0 commit comments

Comments
 (0)