Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.DebugEngine/3.3/DebugEngine.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.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.DebugEngine {
    3030
    31   [StorableClass]
     31  [StorableType("BC1A9855-D280-4314-A272-CD2120679F12")]
    3232  [Item("Debug Engine", "Engine for debugging algorithms.")]
    3333  public class DebugEngine : Executable, IEngine {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected DebugEngine(bool deserializing)
    39       : base(deserializing) {
     38    protected DebugEngine(StorableConstructorFlag _) : base(_) {
    4039      InitializeTimer();
    4140    }

  • trunk/HeuristicLab.DebugEngine/3.3/ExecutionStack.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.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.DebugEngine {
    3030
    31   [StorableClass]
     31  [StorableType("FE481B4B-BA25-4889-AAC7-6C88D852D971")]
    3232  public class ExecutionStack : ObservableList<IOperation>, IContent, IDeepCloneable {
    3333
    … …  
    3737
    3838    [StorableConstructor]
    39     protected ExecutionStack(bool deserializing) : base(deserializing) { }
     39    protected ExecutionStack(StorableConstructorFlag _) : base(_) { }
    4040    protected ExecutionStack(ExecutionStack original, Cloner cloner) {
    4141      cloner.RegisterClonedObject(original, this);

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

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.DebugEngine</RootNamespace>
    1212    <AssemblyName>HeuristicLab.DebugEngine-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    8989  </PropertyGroup>
    9090  <ItemGroup>
     91    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     92      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     93    </Reference>
     94    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     95      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     96    </Reference>
    9197    <Reference Include="System" />
    9298    <Reference Include="System.Core" />
    9399    <Reference Include="System.Drawing" />
     100    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     101      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     102    </Reference>
    94103  </ItemGroup>
    95104  <ItemGroup>
    … …  
    105114  <ItemGroup>
    106115    <None Include="HeuristicLab.snk" />
     116    <None Include="packages.config" />
    107117    <None Include="Plugin.cs.frame" />
    108118    <None Include="Properties\AssemblyInfo.cs.frame" />

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

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

  • trunk/HeuristicLab.DebugEngine/3.3/OperatorTrace.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.
    … …  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.DebugEngine {
    3131
    32   [StorableClass]
     32  [StorableType("F694C6E8-39EC-4705-AB77-D00147A4D542")]
    3333  public class OperatorTrace : ObservableList<IOperator>, IContent, IDeepCloneable {
    3434
    … …  
    6868
    6969    [StorableConstructor]
    70     protected OperatorTrace(bool deserializing) : base(deserializing) { }
     70    protected OperatorTrace(StorableConstructorFlag _) : base(_) { }
    7171
    7272    protected OperatorTrace(OperatorTrace original, Cloner cloner) {

  • trunk/HeuristicLab.DebugEngine/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.DebugEngine/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.DebugEngine/3.3/Utils.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.
Note: See TracChangeset for help on using the changeset viewer.