Ignore:
Timestamp:
07/07/19 23:40:10 (3 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.ParallelEngine/3.3/HeuristicLab.ParallelEngine-3.3.csproj

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.ParallelEngine</RootNamespace>
    1212    <AssemblyName>HeuristicLab.ParallelEngine-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile>
     
    110110  </PropertyGroup>
    111111  <ItemGroup>
     112    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     113      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     114    </Reference>
     115    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     116      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     117    </Reference>
    112118    <Reference Include="System" />
    113119    <Reference Include="System.Core" />
     120    <Reference Include="System.Drawing" />
     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>
    114124    <Reference Include="System.Xml.Linq" />
    115125    <Reference Include="System.Data.DataSetExtensions" />
     
    124134  <ItemGroup>
    125135    <None Include="HeuristicLab.snk" />
     136    <None Include="packages.config" />
    126137    <None Include="Plugin.cs.frame" />
    127138    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

    r15584 r17097  
    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.ParallelEngine {
     
    3333  /// This engine is suitable for parallel processing on shared memory systems which provide multiple cores.
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("3B3366ED-22C5-4E4F-B307-E08FACCF0E20")]
    3636  [Item("Parallel Engine", "Engine for parallel execution of algorithms using multiple threads (suitable for shared memory systems with multiple cores).")]
    3737  public class ParallelEngine : Engine {
     
    5252
    5353    [StorableConstructor]
    54     protected ParallelEngine(bool deserializing) : base(deserializing) { }
     54    protected ParallelEngine(StorableConstructorFlag _) : base(_) { }
    5555    protected ParallelEngine(ParallelEngine original, Cloner cloner)
    5656      : base(original, cloner) {
  • stable/HeuristicLab.ParallelEngine/3.3/Plugin.cs.frame

    r15587 r17097  
    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.
  • stable/HeuristicLab.ParallelEngine/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    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.
  • stable/HeuristicLab.ParallelEngine/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.