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

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

Location:
trunk
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj

    r14738 r16565  
    1111    <RootNamespace>HeuristicLab.Persistence.GUI</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Persistence.GUI-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    137137  <ItemGroup>
    138138    <None Include="HeuristicLab.snk" />
     139    <None Include="packages.config" />
    139140    <None Include="Plugin.cs.frame" />
    140141    <Compile Include="PersistenceAnalysis.cs" />
     
    150151  </ItemGroup>
    151152  <ItemGroup>
     153    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     154      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     155    </Reference>
     156    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     157      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     158    </Reference>
    152159    <Reference Include="System" />
    153160    <Reference Include="System.Core">
     
    156163    <Reference Include="System.Data" />
    157164    <Reference Include="System.Drawing" />
     165    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     166      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     167    </Reference>
    158168    <Reference Include="System.Windows.Forms" />
    159169    <Reference Include="System.Xml" />
  • trunk/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.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.
     
    7676            if (!IsSerializable(type, config))
    7777              types.Add(type);
    78             /* if (!IsCorrectlyStorable(type))
    79               storableInconsistentcy.Add(type); */
    80           }
    81           catch {
     78          } catch {
    8279            types.Add(type);
    8380          }
     
    8683      return types;
    8784    }
    88 
    89     /* private static bool IsCorrectlyStorable(Type type) {
    90       if (StorableAttribute.GetStorableMembers(type).Count() > 0) {
    91         if (!StorableClassAttribute.IsStorableType(type, true))
    92           return false;
    93         if (type.GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, Type.EmptyTypes, null) == null &&
    94           StorableConstructorAttribute.GetStorableConstructor(type) == null)
    95           return false;
    96       }
    97       return true;
    98     }  */
    9985  }
    10086}
  • trunk/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.Designer.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.Persistence.GUI/3.3/PersistenceConfigurationForm.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 System.Linq;
    2626using System.Windows.Forms;
     27using HEAL.Attic;
    2728using HeuristicLab.Persistence.Auxiliary;
    2829using HeuristicLab.Persistence.Core;
  • trunk/HeuristicLab.Persistence.GUI/3.3/Properties/AssemblyInfo.cs.frame

    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.Persistence.GUI/3.3/TypeExtensions.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.