Ignore:
Timestamp:
07/08/19 00:23:12 (21 months ago)
Author:
mkommend
Message:

#2520: Merged 16584, 16585,16594,16595, 16625, 16658, 16659, 16672, 16707, 16729, 16792, 16796, 16797, 16799, 16819, 16906, 16907, 16908, 16933, 16945, 16992, 16994, 16995, 16996, 16997, 17014, 17015, 17017, 17020, 17021, 17022, 17023, 17024, 17029, 17086, 17087, 17088, 17089 into stable.

Location:
stable
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r17097 r17105  
    106106  </PropertyGroup>
    107107  <ItemGroup>
    108     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    109       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    110     </Reference>
    111     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112       <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
    113     </Reference>
    114108    <Reference Include="System" />
    115109    <Reference Include="System.Core">
     
    118112    <Reference Include="System.Data" />
    119113    <Reference Include="System.Drawing" />
    120     <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    121       <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
    122     </Reference>
    123114    <Reference Include="System.Xml" />
    124115  </ItemGroup>
     
    388379  </ItemGroup>
    389380  <ItemGroup>
    390     <None Include="packages.config" />
    391381    <None Include="Properties\AssemblyInfo.cs.frame" />
    392382    <None Include="HeuristicLab.snk" />
     
    486476    </ProjectReference>
    487477  </ItemGroup>
     478  <ItemGroup>
     479    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     480      <SpecificVersion>False</SpecificVersion>
     481      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     482      <Private>False</Private>
     483    </Reference>
     484  </ItemGroup>
    488485  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    489486  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Plugin.cs.frame

    r17097 r17105  
    3939  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    4040  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    41   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     41  [PluginDependency("HeuristicLab.Attic", "1.0")]
    4242  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4343  [PluginDependency("HeuristicLab.Random", "3.3")]
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

    r17097 r17105  
    175175    }
    176176
    177     [Storable(Name = "operators", AllowOneWay = true)]
     177    [Storable(OldName = "operators")]
    178178    private List<IOperator> StorableOperators {
    179179      set { Operators.AddRange(value); }
Note: See TracChangeset for help on using the changeset viewer.