Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Scripting/3.3/Scripts

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScriptBase.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Scripting {
   [Item("C# Script", "An empty C# script.")]
   [Creatable(CreatableAttribute.Categories.Scripts, Priority = 100)]
-  [StorableClass]
+  [StorableType("1630933C-AB5B-44EC-A967-C299CC57E4E3")]
   public class CSharpScript : ExecutableScript, IStorableContent {
     #region Fields & Properties
@@ -49 +49 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected CSharpScript(bool deserializing) : base(deserializing) { }
+    protected CSharpScript(StorableConstructorFlag _) : base(_) { }
     protected CSharpScript(CSharpScript original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScriptBase.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs

@@ -6 +6 @@
 // use 'variables' to work with IEnumerable<T> extension methods on the script's variable store
 
-using System;
-using System.Linq;
-using System.Collections.Generic;
 
-using HeuristicLab.Core;
-using HeuristicLab.Common;
 //using HeuristicLab.Collections;
 //using HeuristicLab.Data;