Changeset 17105 for stable/HeuristicLab.Core
- Timestamp:
- 07/08/19 00:23:12 (5 years ago)
- Location:
- stable
- Files:
-
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
-
stable/HeuristicLab.Core
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Core merged: 16585,16625,16658,16907,16933,16945,16992
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj
r17097 r17105 108 108 </PropertyGroup> 109 109 <ItemGroup> 110 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">111 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>112 </Reference>113 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">114 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>115 </Reference>116 110 <Reference Include="System" /> 117 111 <Reference Include="System.Core"> … … 120 114 <Reference Include="System.Data" /> 121 115 <Reference Include="System.Drawing" /> 122 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">123 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>124 </Reference>125 116 <Reference Include="System.Xml" /> 126 117 </ItemGroup> … … 128 119 <Compile Include="Attributes\ItemAttribute.cs" /> 129 120 <Compile Include="Attributes\CreatableAttribute.cs" /> 130 <None Include="packages.config" />131 121 <None Include="Plugin.cs.frame" /> 132 122 <Compile Include="Collections\CheckedItemCollection.cs" /> … … 282 272 </BootstrapperPackage> 283 273 </ItemGroup> 274 <ItemGroup> 275 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 276 <SpecificVersion>False</SpecificVersion> 277 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 278 <Private>False</Private> 279 </Reference> 280 </ItemGroup> 284 281 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 285 282 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
stable/HeuristicLab.Core/3.3/PersistenceContentManager.cs
r17097 r17105 25 25 using HEAL.Attic; 26 26 using System; 27 using System.Diagnostics; 27 28 28 29 namespace HeuristicLab.Core { … … 30 31 public PersistenceContentManager() : base() { } 31 32 32 protected override IStorableContent LoadContent(string filename) { 33 // first try to load using the new persistence format 34 try { 33 protected override IStorableContent LoadContent(string filename, out Info info) { 34 bool useOldPersistence = XmlParser.CanOpen(filename); 35 IStorableContent content = null; 36 if (useOldPersistence) { 37 var sw = new Stopwatch(); 38 sw.Start(); 39 content = XmlParser.Deserialize<IStorableContent>(filename); 40 sw.Stop(); 41 info = new Info(filename, sw.Elapsed); 42 } else { 35 43 var ser = new ProtoBufSerializer(); 36 return (IStorableContent)ser.Deserialize(filename); 37 } catch (Exception) { 38 // try old format if new format fails 39 return XmlParser.Deserialize<IStorableContent>(filename); 44 content = (IStorableContent)ser.Deserialize(filename, out SerializationInfo serInfo); 45 info = new Info(filename, serInfo); 40 46 } 47 if (content == null) throw new PersistenceException($"Cannot deserialize root element of {filename}"); 48 return content; 41 49 } 50 42 51 43 52 protected override void SaveContent(IStorableContent content, string filename, bool compressed, CancellationToken cancellationToken) { 44 53 var ser = new ProtoBufSerializer(); 45 ser.Serialize(content, filename, cancellationToken); 54 ser.Serialize(content, filename, cancellationToken); 46 55 } 47 56 } -
stable/HeuristicLab.Core/3.3/Plugin.cs.frame
r17097 r17105 31 31 [Plugin("HeuristicLab.Core", "3.3.15.$WCREV$")] 32 32 [PluginFile("HeuristicLab.Core-3.3.dll", PluginFileType.Assembly)] 33 [PluginDependency("HeuristicLab.Attic", "1.0")] 33 34 [PluginDependency("HeuristicLab.Collections", "3.3")] 34 35 [PluginDependency("HeuristicLab.Common", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.