Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 18:16:20 (6 years ago)
Author:
gkronber
Message:

#2520: changed HeuristicLab.MetaOptimization addon to compile with new HL.Persistence

Location:
addons/HeuristicLab.MetaOptimization
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • addons/HeuristicLab.MetaOptimization

    • Property svn:ignore

      •  

        old new  
        88HeuristicLab.MetaOptimization.sln.docstates.suo
        99_ReSharper.HeuristicLab.MetaOptimization
         10packages

  • addons/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HeuristicLab.HiveEngine-3.3.csproj

    r15741 r16574  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    … …  
    1111    <RootNamespace>HeuristicLab.HiveEngine</RootNamespace>
    1212    <AssemblyName>HeuristicLab.HiveEngine-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    109109  </PropertyGroup>
    110110  <ItemGroup>
     111    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     116    </Reference>
    111117    <Reference Include="HeuristicLab.Clients.Hive-3.3">
    112118      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Clients.Hive-3.3.dll</HintPath>
    … …  
    152158    <Reference Include="System.Data" />
    153159    <Reference Include="System.Drawing" />
     160    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     161      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     162    </Reference>
    154163    <Reference Include="System.Runtime.Serialization" />
    155164    <Reference Include="System.Windows.Forms" />
    … …  
    160169    <Compile Include="Exceptions\ScopeMergeException.cs" />
    161170    <Compile Include="Properties\AssemblyInfo.cs" />
     171    <None Include="packages.config" />
    162172    <None Include="Plugin.cs.frame" />
    163173    <Compile Include="HiveEngine.cs" />

  • addons/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

    r16173 r16574  
    2828using HeuristicLab.Common;
    2929using HeuristicLab.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.HiveEngine {
    … …  
    3434  /// Represents an engine that executes operations which can be executed in parallel on the hive
    3535  /// </summary>
    36   [StorableClass]
     36  [StorableType("EF161417-A08F-49FB-8A63-FBF37506BE7E")]
    3737  [Item("Hive Engine", "Engine for parallel execution on the hive. You need enable `Parallel` for at least one operator in your operator graph to have all childoperations parallelized. Also those childoperations must not have sideeffects on a higher scope.")]
    3838  public class HiveEngine : Engine {
    … …  
    104104
    105105    [StorableConstructor]
    106     protected HiveEngine(bool deserializing) : base(deserializing) { }
     106    protected HiveEngine(StorableConstructorFlag _) : base(_) { }
    107107    protected HiveEngine(HiveEngine original, Cloner cloner)
    108108      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.