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
3 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r17097 r17105  
    107107  </PropertyGroup>
    108108  <ItemGroup>
    109     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    110       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    111     </Reference>
    112     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    113       <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
    114     </Reference>
    115109    <Reference Include="System" />
    116110    <Reference Include="System.Core" />
    117111    <Reference Include="System.Drawing" />
    118     <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    119       <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
    120     </Reference>
    121112  </ItemGroup>
    122113  <ItemGroup>
     
    146137  <ItemGroup>
    147138    <None Include="HeuristicLab.snk" />
    148     <None Include="packages.config" />
    149139    <None Include="Plugin.cs.frame" />
    150140    <None Include="Properties\AssemblyInfo.cs.frame" />
     
    221211      <Private>False</Private>
    222212    </ProjectReference>
     213  </ItemGroup>
     214  <ItemGroup>
     215    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     216      <SpecificVersion>False</SpecificVersion>
     217      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     218      <Private>False</Private>
     219    </Reference>
    223220  </ItemGroup>
    224221  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • stable/HeuristicLab.Problems.Scheduling/3.3/Plugin.cs.frame

    r17097 r17105  
    3636  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3737  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    38   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     38  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3939  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4040  public class HeuristicLabProblemsSchedulingPlugin : PluginBase {
Note: See TracChangeset for help on using the changeset viewer.