Changeset 11477

Timestamp:

10/17/14 10:44:42 (10 years ago)

Author:

mkommend

Message:

#2262: Refactored Script.GetAssemblies to get rid of the try/catch block.

File:

• trunk/sources/HeuristicLab.Scripting/3.3/Script.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Scripting/3.3/Script.cs

@@ -24 +24 @@
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
@@ -142 +143 @@
 
     public virtual IEnumerable<Assembly> GetAssemblies() {
-      var assemblies = new List<Assembly>();
-      foreach (var a in AppDomain.CurrentDomain.GetAssemblies()) {
-        try {
-          if (File.Exists(a.Location)) assemblies.Add(a);
-        } catch (NotSupportedException) {
-          // NotSupportedException is thrown while accessing 
-          // the Location property of the anonymously hosted
-          // dynamic methods assembly, which is related to
-          // LINQ queries
-        }
-      }
+      var assemblies = AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.IsDynamic && File.Exists(a.Location)).ToList();    
       assemblies.Add(typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly); // for dlr functionality
       return assemblies;