Changeset 16986

Timestamp:

05/24/19 13:14:35 (6 years ago)

Author:

dpiringe

Message:

#2924:

• changed the use of AppDomain.CurrentDomain.BaseDirectory to Directory.GetCurrentDirectory() in projects HeuristicLab.MathJax and HeuristicLab.Problems.GeneticProgramming, this change helps to load these plugins correctly with the new PluginInfrastructure
• deleted obsolete files from folder HeuristicLab/3.3/Properties and added launchSettings.json for docker

Location:

branches/2924_DotNetCoreMigration

Files:

• HeuristicLab.ExtLibs/HeuristicLab.MathJax/2.6.1/HeuristicLab.MathJax-2.6.1/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.GeneticProgramming/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab/3.3/Properties (added)
• HeuristicLab/3.3/Properties/launchSettings.json (added)

branches/2924_DotNetCoreMigration/HeuristicLab.ExtLibs/HeuristicLab.MathJax/2.6.1/HeuristicLab.MathJax-2.6.1/Plugin.cs.frame

@@ -35 +35 @@
     public override void OnLoad() {
       base.OnLoad();
-      if (!Directory.EnumerateDirectories(AppDomain.CurrentDomain.BaseDirectory, "MathJax", SearchOption.TopDirectoryOnly).Any()) {
-        ZipFile.ExtractToDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "mathjax.zip"), AppDomain.CurrentDomain.BaseDirectory);
+      if (!Directory.EnumerateDirectories(Directory.GetCurrentDirectory()/*AppDomain.CurrentDomain.BaseDirectory*/, "MathJax", SearchOption.TopDirectoryOnly).Any()) {
+        ZipFile.ExtractToDirectory(Path.Combine(Directory.GetCurrentDirectory()/*AppDomain.CurrentDomain.BaseDirectory*/, "mathjax.zip"), Directory.GetCurrentDirectory()/*AppDomain.CurrentDomain.BaseDirectory*/);
       }
     }

branches/2924_DotNetCoreMigration/HeuristicLab.Problems.GeneticProgramming/3.3/Plugin.cs.frame

@@ -47 +47 @@
     public override void OnLoad() {
         base.OnLoad();
-        if (!Directory.EnumerateDirectories(AppDomain.CurrentDomain.BaseDirectory, Path.Combine("Robocode", "libs"), SearchOption.TopDirectoryOnly).Any()) {
-          ZipFile.ExtractToDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Path.Combine("Robocode", "robocode.zip")), AppDomain.CurrentDomain.BaseDirectory);
+        if (!Directory.EnumerateDirectories(Directory.GetCurrentDirectory()/*AppDomain.CurrentDomain.BaseDirectory*/, Path.Combine("Robocode", "libs"), SearchOption.TopDirectoryOnly).Any()) {
+          ZipFile.ExtractToDirectory(Path.Combine(Directory.GetCurrentDirectory()/*AppDomain.CurrentDomain.BaseDirectory*/, Path.Combine("Robocode", "robocode.zip")), Directory.GetCurrentDirectory()/*AppDomain.CurrentDomain.BaseDirectory*/);
         }
       }