Changeset 16565 for trunk/HeuristicLab.Persistence.GUI/3.3
- Timestamp:
- 01/28/19 13:41:42 (6 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj
r14738 r16565 11 11 <RootNamespace>HeuristicLab.Persistence.GUI</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Persistence.GUI-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <TargetFrameworkProfile> 15 15 </TargetFrameworkProfile> … … 137 137 <ItemGroup> 138 138 <None Include="HeuristicLab.snk" /> 139 <None Include="packages.config" /> 139 140 <None Include="Plugin.cs.frame" /> 140 141 <Compile Include="PersistenceAnalysis.cs" /> … … 150 151 </ItemGroup> 151 152 <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> 152 159 <Reference Include="System" /> 153 160 <Reference Include="System.Core"> … … 156 163 <Reference Include="System.Data" /> 157 164 <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> 158 168 <Reference Include="System.Windows.Forms" /> 159 169 <Reference Include="System.Xml" /> -
trunk/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 76 76 if (!IsSerializable(type, config)) 77 77 types.Add(type); 78 /* if (!IsCorrectlyStorable(type)) 79 storableInconsistentcy.Add(type); */ 80 } 81 catch { 78 } catch { 82 79 types.Add(type); 83 80 } … … 86 83 return types; 87 84 } 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 } */99 85 } 100 86 } -
trunk/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.Designer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using System.Linq; 26 26 using System.Windows.Forms; 27 using HEAL.Attic; 27 28 using HeuristicLab.Persistence.Auxiliary; 28 29 using HeuristicLab.Persistence.Core; -
trunk/HeuristicLab.Persistence.GUI/3.3/Properties/AssemblyInfo.cs.frame
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence.GUI/3.3/TypeExtensions.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.