Changeset 17158 for stable

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.ExtLibs.sln (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.15.0 (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.15.0)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.7.0/HeuristicLab.ALGLIB-3.7.0/HeuristicLab.ALGLIB-3.7.0.csproj (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (2 diffs)

stable/HeuristicLab.ExtLibs.sln

@@ -78 +78 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Attic", "HeuristicLab.ExtLibs\HeuristicLab.Attic\1.0.0\HeuristicLab.Attic.csproj", "{44A10478-D290-43C2-9757-F08F5292FEA5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-3.15.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.15.0\HeuristicLab.ALGLIB-3.15.0\HeuristicLab.ALGLIB-3.15.0.csproj", "{6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB-3.15.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.15.0\ALGLIB-3.15.0\ALGLIB-3.15.0.csproj", "{BFFE7AFD-0996-4381-BF06-5D031B3E54A8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OrTools-7.0.0", "HeuristicLab.ExtLibs\HeuristicLab.OrTools\7.0.0\HeuristicLab.OrTools-7.0.0\HeuristicLab.OrTools-7.0.0.csproj", "{AEC895BC-C519-49D3-9A94-6B1C71AD6671}"
@@ -509 +513 @@
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.ActiveCfg = Release|Any CPU
     {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.Build.0 = Release|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Debug|x64.Build.0 = Debug|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Debug|x86.Build.0 = Debug|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Release|x64.ActiveCfg = Release|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Release|x64.Build.0 = Release|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Release|x86.ActiveCfg = Release|Any CPU
+    {6CAB3410-EBD4-40D9-ABD6-AA95BB684C65}.Release|x86.Build.0 = Release|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Debug|x64.Build.0 = Debug|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Debug|x86.Build.0 = Debug|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Release|Any CPU.Build.0 = Release|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Release|x64.ActiveCfg = Release|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Release|x64.Build.0 = Release|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Release|x86.ActiveCfg = Release|Any CPU
+    {BFFE7AFD-0996-4381-BF06-5D031B3E54A8}.Release|x86.Build.0 = Release|Any CPU
     {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|Any CPU.Build.0 = Debug|Any CPU

stable/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.7.0/HeuristicLab.ALGLIB-3.7.0/HeuristicLab.ALGLIB-3.7.0.csproj

@@ -127 +127 @@
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ALGLIB changes by HEAL.txt" />
     <Content Include="ALGLIB License-3.7.0.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

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;