Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/04/12 16:45:02 (12 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch
Location:
branches/HeuristicLab.Hive.Azure
Files:
4 deleted
5 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks.Views/3.3

    • Property svn:ignore
      •  

        old new  
        11Plugin.cs
        22obj
         3*.vs10x
         4*.user
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks.Views/3.3/HeuristicLab.Algorithms.Benchmarks.Views-3.3.csproj

    r7015 r7270  
    8484    <Reference Include="System" />
    8585    <Reference Include="System.Core" />
    86     <Reference Include="System.Drawing" />
     86    <Reference Include="System.Data" />
    8787    <Reference Include="System.Windows.Forms" />
    88     <Reference Include="System.Xml.Linq" />
    89     <Reference Include="System.Data.DataSetExtensions" />
    90     <Reference Include="Microsoft.CSharp" />
    91     <Reference Include="System.Data" />
    9288    <Reference Include="System.Xml" />
    9389  </ItemGroup>
    9490  <ItemGroup>
    95     <Compile Include="BenchmarkView.cs">
     91    <Compile Include="BenchmarkAlgorithmView.cs">
    9692      <SubType>UserControl</SubType>
    9793    </Compile>
    98     <Compile Include="BenchmarkView.Designer.cs">
    99       <DependentUpon>BenchmarkView.cs</DependentUpon>
    100     </Compile>
    101     <Compile Include="IBenchmarkView.cs">
    102       <SubType>UserControl</SubType>
    103     </Compile>
    104     <Compile Include="IBenchmarkView.Designer.cs">
    105       <DependentUpon>IBenchmarkView.cs</DependentUpon>
     94    <Compile Include="BenchmarkAlgorithmView.Designer.cs">
     95      <DependentUpon>BenchmarkAlgorithmView.cs</DependentUpon>
    10696    </Compile>
    10797    <Compile Include="Plugin.cs" />
     
    117107      <Project>{068C70A7-8CAF-4AB6-8721-4564D62292BC}</Project>
    118108      <Name>HeuristicLab.Algorithms.Benchmarks-3.3</Name>
    119       <Private>False</Private>
    120     </ProjectReference>
    121     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    122       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    123       <Name>HeuristicLab.Collections-3.3</Name>
    124109      <Private>False</Private>
    125110    </ProjectReference>
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks.Views/3.3/Plugin.cs.frame

    r7006 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626  /// Plugin class for HeuristicLab.Algorithms.Benchmarks plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Algorithms.Benchmarks.Views", "Provides views for benchmarking algorithms.", "3.3.5.$WCREV$")]
    29   [PluginFile("HeuristicLab.Algorithms.Benchmarks.Views-3.3.dll", PluginFileType.Assembly)] 
     28  [Plugin("HeuristicLab.Algorithms.Benchmarks.Views", "Provides views for performance benchmark algorithms.", "3.3.6.$WCREV$")]
     29  [PluginFile("HeuristicLab.Algorithms.Benchmarks.Views-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Algorithms.Benchmarks", "3.3")]
    3031  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    31   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 
     32  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3233  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3334  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    34   [PluginDependency("HeuristicLab.Algorithms.Benchmarks", "3.3")]
    3535  public class HeuristicLabAlgorithmsBenchmarksViewsPlugin : PluginBase {
    3636  }
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks.Views/3.3/Properties/AssemblyInfo.cs.frame

    r7006 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2727// associated with an assembly.
    2828[assembly: AssemblyTitle("HeuristicLab.Algorithms.Benchmarks.Views")]
    29 [assembly: AssemblyDescription("Benchmarking")]
     29[assembly: AssemblyDescription("Views of the HeuristicLab performance benchmark algorithms")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
     
    4141
    4242// The following GUID is for the ID of the typelib if this project is exposed to COM
    43 [assembly: Guid("3E422463-0CE0-400D-9544-5C11D5818769")]
     43[assembly: Guid("E4BF5E27-BFA8-4402-9B75-4BE3B91E012C")]
    4444
    4545// Version information for an assembly consists of the following four values:
     
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.