Changeset 2056 for trunk/eraser/Eraser.Manager/Plugins.cs

Timestamp:

5/4/2010 7:22:46 AM (3 years ago)

Author:

lowjoel

Message:

Undo some changes in r2050 where the assembly resolution code would be removed upon loading of plugins -- this caused certain types to be unable to load and crash the program.

File:

• trunk/eraser/Eraser.Manager/Plugins.cs (modified) (1 diff)

trunk/eraser/Eraser.Manager/Plugins.cs

@@ -143 +143 @@
             AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += ResolveReflectionDependency;
 
-            try
-            {
-                //Load all core plugins first
-                foreach (KeyValuePair<string, string> plugin in CorePlugins)
-                {
-                    LoadCorePlugin(Path.Combine(PluginsFolder, plugin.Key), plugin.Value);
-                }
-
-                //Then load the rest
-                foreach (string fileName in Directory.GetFiles(PluginsFolder))
-                {
-                    FileInfo file = new FileInfo(fileName);
-                    if (file.Extension.Equals(".dll"))
-                        try
-                        {
-                            LoadPlugin(file.FullName);
-                        }
-                        catch (BadImageFormatException)
-                        {
-                        }
-                        catch (FileLoadException)
-                        {
-                        }
-                }
-            }
-            finally
-            {
-                AppDomain.CurrentDomain.AssemblyResolve -= AssemblyResolve;
-                AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= ResolveReflectionDependency;
+            //Load all core plugins first
+            foreach (KeyValuePair<string, string> plugin in CorePlugins)
+            {
+                LoadCorePlugin(Path.Combine(PluginsFolder, plugin.Key), plugin.Value);
+            }
+
+            //Then load the rest
+            foreach (string fileName in Directory.GetFiles(PluginsFolder))
+            {
+                FileInfo file = new FileInfo(fileName);
+                if (file.Extension.Equals(".dll"))
+                    try
+                    {
+                        LoadPlugin(file.FullName);
+                    }
+                    catch (BadImageFormatException)
+                    {
+                    }
+                    catch (FileLoadException)
+                    {
+                    }
             }
         }