Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/08/19 00:23:12 (5 years 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
4 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.BinPacking

  • stable/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r17097 r17105  
    7272  </PropertyGroup>
    7373  <ItemGroup>
    74     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    75       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    76     </Reference>
    77     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    78       <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
    79     </Reference>
    8074    <Reference Include="System" />
    8175    <Reference Include="System.Core" />
    8276    <Reference Include="System.Drawing" />
    83     <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    84       <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
    85     </Reference>
    8677    <Reference Include="System.IO.Compression" />
    8778    <Reference Include="System.Windows.Forms" />
    … …  
    162153    <EmbeddedResource Include="3D\Instances\ContainerPackingInstances.zip" />
    163154    <None Include="HeuristicLab.snk" />
    164     <None Include="packages.config" />
    165155    <None Include="Properties\AssemblyInfo.cs.frame" />
    166156    <None Include="Plugin.cs.frame" />
    167157  </ItemGroup>
    168   <ItemGroup />
     158  <ItemGroup>
     159    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     160      <SpecificVersion>False</SpecificVersion>
     161      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     162      <Private>False</Private>
     163    </Reference>
     164  </ItemGroup>
    169165  <ItemGroup>
    170166    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">

  • stable/HeuristicLab.Problems.BinPacking/3.3/Plugin.cs.frame

    r15587 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")]
Note: See TracChangeset for help on using the changeset viewer.