Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (4 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj

    r11623 r16565  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
     
    106106  </PropertyGroup>
    107107  <ItemGroup>
     108    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     109      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     113    </Reference>
    108114    <Reference Include="System" />
    109115    <Reference Include="System.Core">
     
    111117    </Reference>
    112118    <Reference Include="System.Data" />
     119    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     120      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     121    </Reference>
    113122    <Reference Include="System.Xml" />
    114123  </ItemGroup>
    115124  <ItemGroup>
     125    <None Include="packages.config" />
    116126    <None Include="Plugin.cs.frame" />
    117127    <Compile Include="Plugin.cs" />
  • trunk/HeuristicLab.SequentialEngine/3.3/Plugin.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.SequentialEngine/3.3/Properties/AssemblyInfo.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.SequentialEngine {
     
    3030  /// Engine for sequential execution of algorithms.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("2100B28B-18B3-41F5-B8A2-1DD009ADF4A9")]
    3333  [Item("Sequential Engine", "Engine for sequential execution of algorithms.")]
    3434  public class SequentialEngine : Engine {
    3535    [StorableConstructor]
    36     protected SequentialEngine(bool deserializing) : base(deserializing) { }
     36    protected SequentialEngine(StorableConstructorFlag _) : base(_) { }
    3737    protected SequentialEngine(SequentialEngine original, Cloner cloner) : base(original, cloner) { }
    3838    public SequentialEngine() : base() { }
Note: See TracChangeset for help on using the changeset viewer.