🌐 AI搜索 & 代理 主页
Skip to content

GH48 - Support additional assembly loading #49

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

Closed
adamklein wants to merge 1 commit into from
Closed

GH48 - Support additional assembly loading #49

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
19 changes: 14 additions & 5 deletions src/runtime/assemblymanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ static void AssemblyLoadHandler(Object ob, AssemblyLoadEventArgs args){
//===================================================================

static Assembly ResolveHandler(Object ob, ResolveEventArgs args){
string name = args.Name.ToLower();
AssemblyName name = new AssemblyName(args.Name);
for (int i = 0; i < assemblies.Count; i++) {
Assembly a = (Assembly)assemblies[i];
string full = a.FullName.ToLower();
if (full.StartsWith(name)) {
if (full.StartsWith(name.Name)) {
return a;
}
}
return LoadAssemblyPath(args.Name);
return LoadAssemblyPath(name.Name);
}


Expand Down Expand Up @@ -212,12 +212,21 @@ public static Assembly LoadAssemblyPath(string name) {
// using other versions already loaded. This is a problem if there
// is a Python.Runtime.dll in the same folder as the assembly being
// loaded, as that will result in two instances being loaded.
try {
try {
byte[] bytes = System.IO.File.ReadAllBytes(path);
assembly = Assembly.Load(bytes);
loadedAssemblies[path] = assembly;
}
catch {}
catch {
try {
// last ditch effort - might be only way
assembly = Assembly.LoadFrom(path);
}
catch {
// Do we really want to swallow everything here?
// System.Console.WriteLine("Warning: could not load %s", path);
}
}
}
return assembly;
}
Expand Down