Changeset 5407

Timestamp:

02/03/11 00:56:23 (14 years ago)

Author:

swagner

Message:

Adapted PluginLoader to ignore cases in assembly paths, additionally load exe-files and ignore assemblies which cannot be loaded (#1351)

File:

• trunk/sources/HeuristicLab/3.3/Tests/PluginLoader.cs (modified) (2 diffs)

trunk/sources/HeuristicLab/3.3/Tests/PluginLoader.cs

@@ -9 +9 @@
 namespace HeuristicLab_33.Tests {
   internal static class PluginLoader {
+    public const string ExecutableExtension = ".exe";
     public const string AssemblyExtension = ".dll";
     public const string TestAccessorAssemblyExtension = "_Accessor.dll";
@@ -15 +16 @@
 
     static PluginLoader() {
-      foreach (string path in Directory.EnumerateFiles(Environment.CurrentDirectory)
-        .Where(s => s.EndsWith(AssemblyExtension) && !s.EndsWith(TestAccessorAssemblyExtension) && !s.EndsWith(TestAssemblyExtension)))
-        Assembly.LoadFrom(path);
-
+      foreach (string path in Directory.EnumerateFiles(Environment.CurrentDirectory).Where(s => IsRelevantAssemblyPath(s))) {
+        try {
+          Assembly.LoadFrom(path);
+        }
+        catch (BadImageFormatException) { }
+      }
       Assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
     }
 
+    private static bool IsRelevantAssemblyPath(string path) {
+      bool valid = true;
+      valid = valid && (path.EndsWith(ExecutableExtension, StringComparison.OrdinalIgnoreCase) || path.EndsWith(AssemblyExtension, StringComparison.OrdinalIgnoreCase));
+      valid = valid && !path.EndsWith(TestAccessorAssemblyExtension, StringComparison.OrdinalIgnoreCase) && !path.EndsWith(TestAssemblyExtension, StringComparison.OrdinalIgnoreCase);
+      return valid;
+    }
+
     public static bool IsPluginAssembly(Assembly assembly) {
-      return assembly.GetExportedTypes()
-        .Where(t => typeof(IPlugin).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).Any();
+      return assembly.GetExportedTypes().Any(t => typeof(IPlugin).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface);
     }
   }