Revert "Use Assembly.Load(Byte[]) instead of Assembly.LoadFrom."

tonyroberts · tonyroberts · commit 39fee54c9fe4 · 2014-06-05T11:08:48.000+01:00
This reverts commit b65fa30.
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -30,7 +30,6 @@ internal class AssemblyManager {
         static ResolveEventHandler rhandler;
         static Dictionary<string, int> probed;
         static List<Assembly> assemblies;
-        static Dictionary<string, Assembly> loadedAssemblies;
         internal static List<string> pypath;
 
         private AssemblyManager() {}
@@ -47,7 +46,6 @@ internal static void Initialize() {
             probed = new Dictionary<string, int>(32);
             //generics = new Dictionary<string, Dictionary<string, string>>();
             assemblies = new List<Assembly>(16);
-            loadedAssemblies = new Dictionary<string, Assembly>();
             pypath = new List<string>(16);
 
             AppDomain domain = AppDomain.CurrentDomain;
@@ -204,19 +202,7 @@ public static Assembly LoadAssemblyPath(string name) {
             string path = FindAssembly(name);
             Assembly assembly = null;
             if (path != null) {
-                if (loadedAssemblies.ContainsKey(path)) {
-                    return loadedAssemblies[path];
-                }
-                // Avoid using Assembly.LoadFrom as referenced assemblies that exist
-                // in the same path will be loaded directly from there, rather than
-                // 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   {
-                    byte[] bytes = System.IO.File.ReadAllBytes(path);
-                    assembly = Assembly.Load(bytes);
-                    loadedAssemblies[path] = assembly;
-                }
+                try   { assembly = Assembly.LoadFrom(path); }
                 catch {}
             }
             return assembly;
