Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5298


Ignore:
Timestamp:
01/15/11 00:48:49 (14 years ago)
Author:
swagner
Message:

Cleaned and restructured OKB (trunk integration) branch (#1174)

Location:
branches/OKB (trunk integration)
Files:
2 added
16 deleted
6 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

    r5295 r5298  
    3939  </PropertyGroup>
    4040  <ItemGroup>
    41     <Reference Include="HeuristicLab.Clients.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    42       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath>
    43     </Reference>
    44     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    45       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    46     </Reference>
    47     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    48       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    49     </Reference>
    50     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    51       <SpecificVersion>False</SpecificVersion>
    52       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    53     </Reference>
    54     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    55       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    56     </Reference>
    57     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    58       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
    59     </Reference>
    60     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    61       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    62     </Reference>
    63     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    64       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    65     </Reference>
    66     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    67       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    68     </Reference>
    69     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    70       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     41    <Reference Include="HeuristicLab.Clients.Common-3.3">
     42      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Clients.Common-3.3.dll</HintPath>
     43    </Reference>
     44    <Reference Include="HeuristicLab.Collections-3.3">
     45      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     46    </Reference>
     47    <Reference Include="HeuristicLab.Common-3.3">
     48      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     49    </Reference>
     50    <Reference Include="HeuristicLab.Common.Resources-3.3">
     51      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     52    </Reference>
     53    <Reference Include="HeuristicLab.Core-3.3">
     54      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     55    </Reference>
     56    <Reference Include="HeuristicLab.Core.Views-3.3">
     57      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     58    </Reference>
     59    <Reference Include="HeuristicLab.Data-3.3">
     60      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     61    </Reference>
     62    <Reference Include="HeuristicLab.MainForm-3.3">
     63      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     64    </Reference>
     65    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     66      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     67    </Reference>
     68    <Reference Include="HeuristicLab.Optimization-3.3">
     69      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    7170    </Reference>
    7271    <Reference Include="HeuristicLab.Optimization.Views-3.3">
    73       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    74     </Reference>
    75     <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    76       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimizer-3.3.dll</HintPath>
    77     </Reference>
    78     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    79       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    80     </Reference>
    81     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    82       <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     72      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     73    </Reference>
     74    <Reference Include="HeuristicLab.Optimizer-3.3">
     75      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimizer-3.3.dll</HintPath>
     76    </Reference>
     77    <Reference Include="HeuristicLab.Persistence-3.3">
     78      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     79    </Reference>
     80    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     81      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8382    </Reference>
    8483    <Reference Include="System" />

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/UpdateLocalInstallation.cmd

    r4388 r5298  
    22
    33echo Copying OKB Client Assembly
    4 copy "%SolutionDir%\HeuristicLab.Clients.OKB-3.3\%Outdir%\HeuristicLab.Clients.OKB-3.3.dll" "%target%"
     4copy "%SolutionDir%\HeuristicLab.Clients.OKB\3.3\%Outdir%\HeuristicLab.Clients.OKB-3.3.dll" "%target%"
    55echo ---------------------------
    6 "%SolutionDir%ConfigMerger.exe" "%SolutionDir%\HeuristicLab.Clients.OKB-3.3\%Outdir%\HeuristicLab.Clients.OKB-3.3.dll.config" "%target%\HeuristicLab 3.3.exe.config"
     6"%SolutionDir%ConfigMerger.exe" "%SolutionDir%\HeuristicLab.Clients.OKB\3.3\%Outdir%\HeuristicLab.Clients.OKB-3.3.dll.config" "%target%\HeuristicLab 3.3.exe.config"

  • branches/OKB (trunk integration)/HeuristicLab.OKB.sln

    r4558 r5298  
    33# Visual Studio 2010
    44Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9E843318-7235-4B2B-81A7-160FDDADD9E1}"
    5   ProjectSection(SolutionItems) = preProject
    6     ServiceClient.config = ServiceClient.config
    7   EndProjectSection
    8 EndProject
    9 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.OKB-3.3", "HeuristicLab.Clients.OKB-3.3\HeuristicLab.Clients.OKB-3.3.csproj", "{73857A9C-9706-4B72-8D9C-210B5B6A5691}"
    105EndProject
    116Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.OKB.DataTransfer-3.3", "HeuristicLab.Services.OKB.DataTransfer\3.3\HeuristicLab.Services.OKB.DataTransfer-3.3.csproj", "{209FD7A1-DFB2-4B9F-9268-B95E886B2F7A}"
    … …  
    1611EndProject
    1712Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.OKB.DataAccess-3.3.Tests", "HeuristicLab.Services.OKB.DataAccess\3.3\Tests\HeuristicLab.Services.OKB.DataAccess-3.3.Tests.csproj", "{89234006-FE1B-4A15-AFEC-91CB3526F0A5}"
     13EndProject
     14Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.OKB-3.3", "HeuristicLab.Clients.OKB\3.3\HeuristicLab.Clients.OKB-3.3.csproj", "{73857A9C-9706-4B72-8D9C-210B5B6A5691}"
    1815EndProject
    1916Global
    … …  
    2724  EndGlobalSection
    2825  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    29     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    30     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|Any CPU.Build.0 = Debug|Any CPU
    31     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|x64.ActiveCfg = Debug|Any CPU
    32     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|x86.ActiveCfg = Debug|Any CPU
    33     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|Any CPU.ActiveCfg = Release|Any CPU
    34     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|Any CPU.Build.0 = Release|Any CPU
    35     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|x64.ActiveCfg = Release|Any CPU
    36     {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|x86.ActiveCfg = Release|Any CPU
    3726    {209FD7A1-DFB2-4B9F-9268-B95E886B2F7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3827    {209FD7A1-DFB2-4B9F-9268-B95E886B2F7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    7564    {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Release|x64.ActiveCfg = Release|Any CPU
    7665    {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Release|x86.ActiveCfg = Release|Any CPU
     66    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     67    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|Any CPU.Build.0 = Debug|Any CPU
     68    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|x64.ActiveCfg = Debug|Any CPU
     69    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|x86.ActiveCfg = Debug|Any CPU
     70    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|Any CPU.ActiveCfg = Release|Any CPU
     71    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|Any CPU.Build.0 = Release|Any CPU
     72    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|x64.ActiveCfg = Release|Any CPU
     73    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|x86.ActiveCfg = Release|Any CPU
    7774  EndGlobalSection
    7875  GlobalSection(SolutionProperties) = preSolution

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3

    • Property svn:ignore

      •  

        old new  
        22obj
        33*.user
        4 OKB.designer.cs

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/Tests

    • Property svn:ignore

      •  

        old new  
        11bin
        22obj
         3*.user

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/Tests/DBTests.cs

    r5296 r5298  
    2828namespace HeuristicLab.Services.OKB.DataAccess_33.Tests {
    2929  /// <summary>
    30   /// Summary description for UnitTest1
     30  /// Summary description for DBTests
    3131  /// </summary>
    3232  [TestClass]
    33   public class UnitTest {
     33  public class DBTests {
    3434    private const int PLATFORMS = 1;
    3535    private const int DATATYPES_PER_PLATFORM = 500;
    … …  
    5555    private DataType[] bigintTypes;
    5656
    57     public UnitTest() {
     57    public DBTests() {
    5858      //
    5959      // TODO: Add constructor logic here

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/Tests/HeuristicLab.Services.OKB.DataAccess-3.3.Tests.csproj

    r4384 r5298  
    4747  </ItemGroup>
    4848  <ItemGroup>
     49    <Compile Include="DBTests.cs" />
    4950    <Compile Include="Properties\AssemblyInfo.cs" />
    50     <Compile Include="UnitTest.cs" />
    5151  </ItemGroup>
    5252  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.