Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/21/12 18:02:33 (12 years ago)
Author:
gkronber
Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:
branches/GP-MoveOperators
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7646 r8085  
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <Private>False</Private>
     103    </Reference>
    101104    <Reference Include="Microsoft.CSharp" />
    102105    <Reference Include="System" />
    … …  
    115118    <Reference Include="System.Data" />
    116119    <Reference Include="System.Xml" />
    117     <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     120    <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     121      <Private>False</Private>
     122    </Reference>
    118123  </ItemGroup>
    119124  <ItemGroup>
    … …  
    138143    </Compile>
    139144    <Compile Include="Plugin.cs" />
    140     <Compile Include="ProblemInstanceProviderView.cs">
    141       <SubType>UserControl</SubType>
    142     </Compile>
    143     <Compile Include="ProblemInstanceProviderView.Designer.cs">
    144       <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
    145     </Compile>
    146145    <Compile Include="ProblemView.cs">
    147146      <SubType>UserControl</SubType>
    … …  
    251250    <Compile Include="RunView.Designer.cs">
    252251      <DependentUpon>RunView.cs</DependentUpon>
     252    </Compile>
     253    <Compile Include="RunCollectionViews\RunCollectionDataTableView.cs">
     254      <SubType>UserControl</SubType>
     255    </Compile>
     256    <Compile Include="RunCollectionViews\RunCollectionDataTableView.Designer.cs">
     257      <DependentUpon>RunCollectionDataTableView.cs</DependentUpon>
    253258    </Compile>
    254259    <Compile Include="UserDefinedAlgorithmView.cs">
    … …  
    281286    <None Include="HeuristicLab.snk" />
    282287    <None Include="Properties\AssemblyInfo.cs.frame" />
    283   </ItemGroup>
    284   <ItemGroup>
    285     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    286       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    287       <Name>HeuristicLab.Collections-3.3</Name>
    288       <Private>False</Private>
    289     </ProjectReference>
    290     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    291       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    292       <Name>HeuristicLab.Common.Resources-3.3</Name>
    293       <Private>False</Private>
    294     </ProjectReference>
    295     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    296       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    297       <Name>HeuristicLab.Common-3.3</Name>
    298       <Private>False</Private>
    299     </ProjectReference>
    300     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    301       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    302       <Name>HeuristicLab.Core.Views-3.3</Name>
    303       <Private>False</Private>
    304     </ProjectReference>
    305     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    306       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    307       <Name>HeuristicLab.Core-3.3</Name>
    308       <Private>False</Private>
    309     </ProjectReference>
    310     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    311       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    312       <Name>HeuristicLab.Data.Views-3.3</Name>
    313       <Private>False</Private>
    314     </ProjectReference>
    315     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    316       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    317       <Name>HeuristicLab.Data-3.3</Name>
    318       <Private>False</Private>
    319     </ProjectReference>
    320     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    321       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    322       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    323       <Private>False</Private>
    324     </ProjectReference>
    325     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    326       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    327       <Name>HeuristicLab.MainForm-3.3</Name>
    328       <Private>False</Private>
    329     </ProjectReference>
    330     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    331       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    332       <Name>HeuristicLab.Optimization-3.3</Name>
    333       <Private>False</Private>
    334     </ProjectReference>
    335     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    336       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    337       <Name>HeuristicLab.Persistence-3.3</Name>
    338       <Private>False</Private>
    339     </ProjectReference>
    340     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    341       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    342       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    343       <Private>False</Private>
    344     </ProjectReference>
    345     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    346       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    347       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    348       <Private>False</Private>
    349     </ProjectReference>
    350     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    351       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    352       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    353       <Private>False</Private>
    354     </ProjectReference>
    355288  </ItemGroup>
    356289  <ItemGroup>
    … …  
    371304    </BootstrapperPackage>
    372305  </ItemGroup>
     306  <ItemGroup>
     307    <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
     308      <Project>{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}</Project>
     309      <Name>HeuristicLab.Analysis.Views-3.3</Name>
     310      <Private>False</Private>
     311    </ProjectReference>
     312    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     313      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     314      <Name>HeuristicLab.Collections-3.3</Name>
     315      <Private>False</Private>
     316    </ProjectReference>
     317    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     318      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     319      <Name>HeuristicLab.Common.Resources-3.3</Name>
     320      <Private>False</Private>
     321    </ProjectReference>
     322    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     323      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     324      <Name>HeuristicLab.Common-3.3</Name>
     325      <Private>False</Private>
     326    </ProjectReference>
     327    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     328      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     329      <Name>HeuristicLab.Core.Views-3.3</Name>
     330      <Private>False</Private>
     331    </ProjectReference>
     332    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     333      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     334      <Name>HeuristicLab.Core-3.3</Name>
     335      <Private>False</Private>
     336    </ProjectReference>
     337    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
     338      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
     339      <Name>HeuristicLab.Data.Views-3.3</Name>
     340      <Private>False</Private>
     341    </ProjectReference>
     342    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     343      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     344      <Name>HeuristicLab.Data-3.3</Name>
     345      <Private>False</Private>
     346    </ProjectReference>
     347    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     348      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     349      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     350      <Private>False</Private>
     351    </ProjectReference>
     352    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     353      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     354      <Name>HeuristicLab.MainForm-3.3</Name>
     355      <Private>False</Private>
     356    </ProjectReference>
     357    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     358      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     359      <Name>HeuristicLab.Optimization-3.3</Name>
     360      <Private>False</Private>
     361    </ProjectReference>
     362    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     363      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     364      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     365      <Private>False</Private>
     366    </ProjectReference>
     367    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj">
     368      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
     369      <Name>HeuristicLab.Problems.Instances.Views-3.3</Name>
     370      <Private>False</Private>
     371    </ProjectReference>
     372    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     373      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     374      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     375      <Private>False</Private>
     376    </ProjectReference>
     377    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     378      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     379      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     380      <Private>False</Private>
     381    </ProjectReference>
     382  </ItemGroup>
    373383  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    374384  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.