Changeset 17097 for stable/HeuristicLab.SequentialEngine

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.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj (modified) (3 diffs)
• HeuristicLab.SequentialEngine/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (3 diffs)
• HeuristicLab.SequentialEngine/3.3/packages.config (copied) (copied from trunk/HeuristicLab.SequentialEngine/3.3/packages.config) (1 diff)

stable/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj

@@ -18 +18 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -106 +106 @@
   </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">
@@ -111 +117 @@
     </Reference>
     <Reference Include="System.Data" />
+    <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>
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />

stable/HeuristicLab.SequentialEngine/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.SequentialEngine/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.SequentialEngine/3.3/SequentialEngine.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.
@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.SequentialEngine {
@@ -30 +30 @@
   /// Engine for sequential execution of algorithms.
   /// </summary>
-  [StorableClass]
+  [StorableType("2100B28B-18B3-41F5-B8A2-1DD009ADF4A9")]
   [Item("Sequential Engine", "Engine for sequential execution of algorithms.")]
   public class SequentialEngine : Engine {
     [StorableConstructor]
-    protected SequentialEngine(bool deserializing) : base(deserializing) { }
+    protected SequentialEngine(StorableConstructorFlag _) : base(_) { }
     protected SequentialEngine(SequentialEngine original, Cloner cloner) : base(original, cloner) { }
     public SequentialEngine() : base() { }

stable/HeuristicLab.SequentialEngine/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>