| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -30,7 +30,6 @@ internal class AssemblyManager { | |||
| 30 | 30 | static ResolveEventHandler rhandler; | |
| 31 | 31 | static Dictionary<string, int> probed; | |
| 32 | 32 | static List<Assembly> assemblies; | |
| 33 | - static Dictionary<string, Assembly> loadedAssemblies; | ||
| 34 | 33 | internal static List<string> pypath; | |
| 35 | 34 | ||
| 36 | 35 | private AssemblyManager() {} | |
@@ -47,7 +46,6 @@ internal static void Initialize() { | |||
| 47 | 46 | probed = new Dictionary<string, int>(32); | |
| 48 | 47 | //generics = new Dictionary<string, Dictionary<string, string>>(); | |
| 49 | 48 | assemblies = new List<Assembly>(16); | |
| 50 | - loadedAssemblies = new Dictionary<string, Assembly>(); | ||
| 51 | 49 | pypath = new List<string>(16); | |
| 52 | 50 | ||
| 53 | 51 | AppDomain domain = AppDomain.CurrentDomain; | |
@@ -204,19 +202,7 @@ public static Assembly LoadAssemblyPath(string name) { | |||
| 204 | 202 | string path = FindAssembly(name); | |
| 205 | 203 | Assembly assembly = null; | |
| 206 | 204 | if (path != null) { | |
| 207 | - if (loadedAssemblies.ContainsKey(path)) { | ||
| 208 | - return loadedAssemblies[path]; | ||
| 209 | - } | ||
| 210 | - // Avoid using Assembly.LoadFrom as referenced assemblies that exist | ||
| 211 | - // in the same path will be loaded directly from there, rather than | ||
| 212 | - // using other versions already loaded. This is a problem if there | ||
| 213 | - // is a Python.Runtime.dll in the same folder as the assembly being | ||
| 214 | - // loaded, as that will result in two instances being loaded. | ||
| 215 | - try { | ||
| 216 | - byte[] bytes = System.IO.File.ReadAllBytes(path); | ||
| 217 | - assembly = Assembly.Load(bytes); | ||
| 218 | - loadedAssemblies[path] = assembly; | ||
| 219 | - } | ||
| 205 | + try { assembly = Assembly.LoadFrom(path); } | ||
| 220 | 206 | catch {} | |
| 221 | 207 | } | |
| 222 | 208 | return assembly; | |
| Back | FazBrowse Home | New Git URL |
0 commit comments