Changeset 17158 for stable/HeuristicLab.Scripting

Timestamp:

07/23/19 20:27:38 (5 years ago)

Author:

gkronber

Message:

#2435: merged r17037 and r17110 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (2 diffs)

stable/HeuristicLab.Scripting/3.3/Script.cs

@@ -29 +29 @@
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HEAL.Attic;
 using Microsoft.CSharp;
 
@@ -122 +123 @@
 
     public virtual IEnumerable<Assembly> GetAssemblies() {
-      var assemblies = AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.IsDynamic && File.Exists(a.Location)).ToList();
+      var assemblies = AppDomain.CurrentDomain.GetAssemblies()
+        .Where(a => !a.IsDynamic && File.Exists(a.Location))
+        .GroupBy(x => Regex.Replace(Path.GetFileName(x.Location), @"-[\d.]+\.dll$", ""))
+        .Select(x => x.OrderByDescending(y => y.GetName().Version).First())
+        .ToList();
       assemblies.Add(typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly); // for dlr functionality
       return assemblies;