Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj

    r11623 r16565  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
    … …  
    105105  </PropertyGroup>
    106106  <ItemGroup>
     107    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     108      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     112    </Reference>
    107113    <Reference Include="System" />
    108114    <Reference Include="System.Core">
    … …  
    113119    </Reference>
    114120    <Reference Include="System.Drawing" />
    115   </ItemGroup>
    116   <ItemGroup>
     121    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     122      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     123    </Reference>
     124  </ItemGroup>
     125  <ItemGroup>
     126    <None Include="packages.config" />
    117127    <None Include="Plugin.cs.frame" />
    118128    <Compile Include="Plugin.cs" />

  • trunk/HeuristicLab.Operators.Programmable/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.Operators.Programmable/3.3/ProgrammableOperator.cs

    r16528 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.
    … …  
    3434using HeuristicLab.Core;
    3535using HeuristicLab.Persistence.Auxiliary;
    36 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     36using HEAL.Attic;
    3737using HeuristicLab.PluginInfrastructure;
    3838using Microsoft.CSharp;
    … …  
    4141
    4242  [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
    43   [StorableClass]
     43  [StorableType("741279E4-4C38-4D66-B9F1-03E0F8B47A78")]
    4444  public class ProgrammableOperator : Operator, IParameterizedNamedItem, IStorableContent, IProgrammableItem {
    4545
    … …  
    164164
    165165    [StorableConstructor]
    166     protected ProgrammableOperator(bool deserializing)
    167       : base(deserializing) {
     166    protected ProgrammableOperator(StorableConstructorFlag _) : base(_) {
    168167      ProgrammableOperator.StaticInitialize();
    169168      Assemblies = defaultAssemblyDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);

  • trunk/HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators.Programmable {
    2828
    2929  [Item("ProgrammableSingleSuccessorOperator", "An operator that can be programmed for arbitrary needs and handle a single successor.")]
    30   [StorableClass]
     30  [StorableType("61B9FA72-9C6D-46AC-B514-5240D71170D8")]
    3131  public class ProgrammableSingleSuccessorOperator : ProgrammableOperator {
    3232
    … …  
    4646
    4747    [StorableConstructor]
    48     protected ProgrammableSingleSuccessorOperator(bool deserializing) : base(deserializing) { }
     48    protected ProgrammableSingleSuccessorOperator(StorableConstructorFlag _) : base(_) { }
    4949    protected ProgrammableSingleSuccessorOperator(ProgrammableSingleSuccessorOperator original, Cloner cloner)
    5050      : base(original, cloner) {

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