Changeset 17097 for stable/HeuristicLab.DebugEngine/3.3

Timestamp:

07/07/19 23:40:10 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DebugEngine/3.3/DebugEngine.cs (modified) (3 diffs)
• HeuristicLab.DebugEngine/3.3/ExecutionStack.cs (modified) (3 diffs)
• HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj (modified) (3 diffs)
• HeuristicLab.DebugEngine/3.3/OperationChangedEventArgs.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/OperationContent.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/OperatorTrace.cs (modified) (3 diffs)
• HeuristicLab.DebugEngine/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/Utils.cs (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/packages.config (copied) (copied from trunk/HeuristicLab.DebugEngine/3.3/packages.config) (1 diff)

stable/HeuristicLab.DebugEngine/3.3/DebugEngine.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.DebugEngine {
 
-  [StorableClass]
+  [StorableType("BC1A9855-D280-4314-A272-CD2120679F12")]
   [Item("Debug Engine", "Engine for debugging algorithms.")]
   public class DebugEngine : Executable, IEngine {
@@ -36 +36 @@
 
     [StorableConstructor]
-    protected DebugEngine(bool deserializing)
-      : base(deserializing) {
+    protected DebugEngine(StorableConstructorFlag _) : base(_) {
       InitializeTimer();
     }

stable/HeuristicLab.DebugEngine/3.3/ExecutionStack.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.DebugEngine {
 
-  [StorableClass]
+  [StorableType("FE481B4B-BA25-4889-AAC7-6C88D852D971")]
   public class ExecutionStack : ObservableList<IOperation>, IContent, IDeepCloneable {
 
@@ -37 +37 @@
 
     [StorableConstructor]
-    protected ExecutionStack(bool deserializing) : base(deserializing) { }
+    protected ExecutionStack(StorableConstructorFlag _) : base(_) { }
     protected ExecutionStack(ExecutionStack original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);

stable/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.DebugEngine</RootNamespace>
     <AssemblyName>HeuristicLab.DebugEngine-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -89 +89 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -105 +114 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

stable/HeuristicLab.DebugEngine/3.3/OperationChangedEventArgs.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.

stable/HeuristicLab.DebugEngine/3.3/OperationContent.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.

stable/HeuristicLab.DebugEngine/3.3/OperatorTrace.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.
@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.DebugEngine {
 
-  [StorableClass]
+  [StorableType("F694C6E8-39EC-4705-AB77-D00147A4D542")]
   public class OperatorTrace : ObservableList<IOperator>, IContent, IDeepCloneable {
 
@@ -68 +68 @@
 
     [StorableConstructor]
-    protected OperatorTrace(bool deserializing) : base(deserializing) { }
+    protected OperatorTrace(StorableConstructorFlag _) : base(_) { }
 
     protected OperatorTrace(OperatorTrace original, Cloner cloner) {

stable/HeuristicLab.DebugEngine/3.3/Plugin.cs.frame

@@ -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.

stable/HeuristicLab.DebugEngine/3.3/Properties/AssemblyInfo.cs.frame

@@ -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.

stable/HeuristicLab.DebugEngine/3.3/Utils.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.

stable/HeuristicLab.DebugEngine/3.3/packages.config

@@ -2 +2 @@
 <packages>
   <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
-  <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
+  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
 </packages>