Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/22/10 11:00:00 (14 years ago)
Author:
cneumuel
Message:

resolved remaining conflicts in 3.3-HiveMigration branch (#1091)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
2 deleted
16 edited
2 copied
2 moved

Legend:

Unmodified
Added
Removed

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess.ADOHelper/3.3/HeuristicLab.DataAccess.ADOHelper-3.3.csproj

    r4073 r4076  
    162162    </BootstrapperPackage>
    163163  </ItemGroup>
     164  <ItemGroup>
     165    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     166      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     167      <Name>HeuristicLab.DataAccess-3.3</Name>
     168    </ProjectReference>
     169  </ItemGroup>
    164170</Project>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess/3.3/HeuristicLab.DataAccess-3.3.csproj

    r4075 r4076  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    … …  
    1515    <SignAssembly>true</SignAssembly>
    1616    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     17    <IsWebBootstrapper>false</IsWebBootstrapper>
     18    <StartupObject>
     19    </StartupObject>
     20    <FileUpgradeFlags>
     21    </FileUpgradeFlags>
     22    <OldToolsVersion>3.5</OldToolsVersion>
     23    <UpgradeBackupLocation />
    1724    <PublishUrl>publish\</PublishUrl>
    1825    <Install>true</Install>
    … …  
    2734    <ApplicationRevision>0</ApplicationRevision>
    2835    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
    29     <IsWebBootstrapper>false</IsWebBootstrapper>
    3036    <UseApplicationTrust>false</UseApplicationTrust>
    3137    <BootstrapperEnabled>true</BootstrapperEnabled>
    32     <StartupObject>
    33     </StartupObject>
    3438  </PropertyGroup>
    3539  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    4145    <ErrorReport>prompt</ErrorReport>
    4246    <WarningLevel>4</WarningLevel>
     47    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4348  </PropertyGroup>
    4449  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    4954    <ErrorReport>prompt</ErrorReport>
    5055    <WarningLevel>4</WarningLevel>
     56    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5157  </PropertyGroup>
    5258  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    5763    <PlatformTarget>x86</PlatformTarget>
    5864    <ErrorReport>prompt</ErrorReport>
     65    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5966  </PropertyGroup>
    6067  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    6572    <PlatformTarget>x86</PlatformTarget>
    6673    <ErrorReport>prompt</ErrorReport>
     74    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6775  </PropertyGroup>
    6876  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    7381    <PlatformTarget>x64</PlatformTarget>
    7482    <ErrorReport>prompt</ErrorReport>
     83    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    7584  </PropertyGroup>
    7685  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    8190    <PlatformTarget>x64</PlatformTarget>
    8291    <ErrorReport>prompt</ErrorReport>
     92    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    8393  </PropertyGroup>
    8494  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    106116    <Compile Include="Interfaces\IPersistableObject.cs" />
    107117  </ItemGroup>
    108   <ItemGroup>
    109     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    110       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    111       <Name>HeuristicLab.Core-3.2</Name>
    112     </ProjectReference>
    113     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    114       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    115       <Name>HeuristicLab.PluginInfrastructure</Name>
    116     </ProjectReference>
    117   </ItemGroup>
    118118  <PropertyGroup>
    119119    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    … …  
    127127    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    128128      <Visible>False</Visible>
    129       <ProductName>.NET Framework Client Profile</ProductName>
     129      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
    130130      <Install>false</Install>
    131131    </BootstrapperPackage>
    … …  
    157157  </ItemGroup>
    158158  <ItemGroup>
     159    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     160      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     161    </Reference>
    159162    <Reference Include="System" />
    160163    <Reference Include="System.Runtime.Serialization">

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4074 r4076  
    1616  EndProjectSection
    1717EndProject
    18 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Security.ADODataAccess-3.3", "HeuristicLab.Security.ADODataAccess\3.3\HeuristicLab.Security.ADODataAccess-3.3.csproj", "{FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}"
    19 EndProject
    2018Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Security.Contracts-3.3", "HeuristicLab.Security.Contracts\3.3\HeuristicLab.Security.Contracts-3.3.csproj", "{D59E852C-F205-4647-8C05-EB9ED1CF44E9}"
    2119EndProject
    … …  
    2624Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Security.Server-3.3", "HeuristicLab.Security.Server\3.3\HeuristicLab.Security.Server-3.3.csproj", "{E3288D4B-7A51-499A-AC5B-019319CE51DC}"
    2725EndProject
     26Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataAccess.ADOHelper-3.3", "HeuristicLab.DataAccess.ADOHelper\3.3\HeuristicLab.DataAccess.ADOHelper-3.3.csproj", "{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}"
     27EndProject
     28Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Communication-3.3", "HeuristicLab.Hive.Client.Communication\3.3\HeuristicLab.Hive.Client.Communication-3.3.csproj", "{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}"
     29EndProject
     30Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Console-3.3", "HeuristicLab.Hive.Client.Console\3.3\HeuristicLab.Hive.Client.Console-3.3.csproj", "{8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}"
     31EndProject
     32Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.ExecutionEngine-3.3", "HeuristicLab.Hive.Client.ExecutionEngine\3.3\HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
     33EndProject
     34Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Contracts-3.3", "HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj", "{134F93D7-E7C8-4ECD-9923-7F63259A60D8}"
     35EndProject
     36Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Engine-3.3", "HeuristicLab.Hive.Engine\3.3\HeuristicLab.Hive.Engine-3.3.csproj", "{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}"
     37EndProject
     38Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server-3.3", "HeuristicLab.Hive.Server\3.3\HeuristicLab.Hive.Server-3.3.csproj", "{A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}"
     39EndProject
     40Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Console-3.3", "HeuristicLab.Hive.Server.Console\3.3\HeuristicLab.Hive.Server.Console-3.3.csproj", "{42A1D075-6C12-4DD9-B0C2-C6F5210A8119}"
     41EndProject
     42Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.DataAccess-3.3", "HeuristicLab.Hive.Server.DataAccess\3.3\HeuristicLab.Hive.Server.DataAccess-3.3.csproj", "{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}"
     43EndProject
     44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.LINQDataAccess-3.3", "HeuristicLab.Hive.Server.LINQDataAccess\3.3\HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj", "{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}"
     45EndProject
     46Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Scheduler-3.3", "HeuristicLab.Hive.Server.Scheduler\3.3\HeuristicLab.Hive.Server.Scheduler-3.3.csproj", "{679E977A-117B-456E-8594-2A4DEADB658B}"
     47EndProject
    2848Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataAccess-3.3", "HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj", "{9076697B-C151-46CD-95BC-1D059492B478}"
    2949EndProject
    30 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataAccess.ADOHelper-3.3", "HeuristicLab.DataAccess.ADOHelper\3.3\HeuristicLab.DataAccess.ADOHelper-3.3.csproj", "{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}"
    31 EndProject
    3250Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Common-3.3", "HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj", "{89F4BC52-C174-481E-9BD2-3814171020E8}"
    33 EndProject
    34 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Communication-3.3", "HeuristicLab.Hive.Client.Communication\3.3\HeuristicLab.Hive.Client.Communication-3.3.csproj", "{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}"
    35 EndProject
    36 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.Console-3.3", "HeuristicLab.Hive.Client.Console\3.3\HeuristicLab.Hive.Client.Console-3.3.csproj", "{8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}"
    37 EndProject
    38 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.ExecutionEngine-3.3", "HeuristicLab.Hive.Client.ExecutionEngine\3.3\HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
    39 EndProject
    40 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Contracts-3.3", "HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj", "{134F93D7-E7C8-4ECD-9923-7F63259A60D8}"
    41 EndProject
    42 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Engine-3.3", "HeuristicLab.Hive.Engine\3.3\HeuristicLab.Hive.Engine-3.3.csproj", "{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}"
    43 EndProject
    44 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server-3.3", "HeuristicLab.Hive.Server\3.3\HeuristicLab.Hive.Server-3.3.csproj", "{A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}"
    45 EndProject
    46 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Console-3.3", "HeuristicLab.Hive.Server.Console\3.3\HeuristicLab.Hive.Server.Console-3.3.csproj", "{42A1D075-6C12-4DD9-B0C2-C6F5210A8119}"
    47 EndProject
    48 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.DataAccess-3.3", "HeuristicLab.Hive.Server.DataAccess\3.3\HeuristicLab.Hive.Server.DataAccess-3.3.csproj", "{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}"
    49 EndProject
    50 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.LINQDataAccess-3.3", "HeuristicLab.Hive.Server.LINQDataAccess\3.3\HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj", "{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}"
    51 EndProject
    52 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Scheduler-3.3", "HeuristicLab.Hive.Server.Scheduler\3.3\HeuristicLab.Hive.Server.Scheduler-3.3.csproj", "{679E977A-117B-456E-8594-2A4DEADB658B}"
    5351EndProject
    5452Global
    … …  
    9492    {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Release|x64.ActiveCfg = Release|Any CPU
    9593    {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Release|x86.ActiveCfg = Release|Any CPU
    96     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    97     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
    98     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Debug|x64.ActiveCfg = Debug|x64
    99     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Debug|x64.Build.0 = Debug|x64
    100     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Debug|x86.ActiveCfg = Debug|x86
    101     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Debug|x86.Build.0 = Debug|x86
    102     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
    103     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Release|Any CPU.Build.0 = Release|Any CPU
    104     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Release|x64.ActiveCfg = Release|x64
    105     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Release|x64.Build.0 = Release|x64
    106     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Release|x86.ActiveCfg = Release|x86
    107     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}.Release|x86.Build.0 = Release|x86
    10894    {D59E852C-F205-4647-8C05-EB9ED1CF44E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    10995    {D59E852C-F205-4647-8C05-EB9ED1CF44E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    154140    {E3288D4B-7A51-499A-AC5B-019319CE51DC}.Release|x86.ActiveCfg = Release|x86
    155141    {E3288D4B-7A51-499A-AC5B-019319CE51DC}.Release|x86.Build.0 = Release|x86
    156     {9076697B-C151-46CD-95BC-1D059492B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    157     {9076697B-C151-46CD-95BC-1D059492B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
    158     {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x64.ActiveCfg = Debug|x64
    159     {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x64.Build.0 = Debug|x64
    160     {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x86.ActiveCfg = Debug|x86
    161     {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x86.Build.0 = Debug|x86
    162     {9076697B-C151-46CD-95BC-1D059492B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
    163     {9076697B-C151-46CD-95BC-1D059492B478}.Release|Any CPU.Build.0 = Release|Any CPU
    164     {9076697B-C151-46CD-95BC-1D059492B478}.Release|x64.ActiveCfg = Release|x64
    165     {9076697B-C151-46CD-95BC-1D059492B478}.Release|x64.Build.0 = Release|x64
    166     {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.ActiveCfg = Release|x86
    167     {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.Build.0 = Release|x86
    168142    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    169143    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    178152    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.ActiveCfg = Release|x86
    179153    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.Build.0 = Release|x86
    180     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    181     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
    182     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.ActiveCfg = Debug|x64
    183     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.Build.0 = Debug|x64
    184     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
    185     {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
    186     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    187     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
    188     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.ActiveCfg = Release|x64
    189     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.Build.0 = Release|x64
    190     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.ActiveCfg = Release|x86
    191     {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.Build.0 = Release|x86
    192154    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    193155    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    310272    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|x86.ActiveCfg = Release|x86
    311273    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|x86.Build.0 = Release|x86
     274    {9076697B-C151-46CD-95BC-1D059492B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     275    {9076697B-C151-46CD-95BC-1D059492B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
     276    {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x64.ActiveCfg = Debug|x64
     277    {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x64.Build.0 = Debug|x64
     278    {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x86.ActiveCfg = Debug|x86
     279    {9076697B-C151-46CD-95BC-1D059492B478}.Debug|x86.Build.0 = Debug|x86
     280    {9076697B-C151-46CD-95BC-1D059492B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
     281    {9076697B-C151-46CD-95BC-1D059492B478}.Release|Any CPU.Build.0 = Release|Any CPU
     282    {9076697B-C151-46CD-95BC-1D059492B478}.Release|x64.ActiveCfg = Release|x64
     283    {9076697B-C151-46CD-95BC-1D059492B478}.Release|x64.Build.0 = Release|x64
     284    {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.ActiveCfg = Release|x86
     285    {9076697B-C151-46CD-95BC-1D059492B478}.Release|x86.Build.0 = Release|x86
     286    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     287    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     288    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.ActiveCfg = Debug|x64
     289    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x64.Build.0 = Debug|x64
     290    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.ActiveCfg = Debug|x86
     291    {89F4BC52-C174-481E-9BD2-3814171020E8}.Debug|x86.Build.0 = Debug|x86
     292    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     293    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|Any CPU.Build.0 = Release|Any CPU
     294    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.ActiveCfg = Release|x64
     295    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x64.Build.0 = Release|x64
     296    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.ActiveCfg = Release|x86
     297    {89F4BC52-C174-481E-9BD2-3814171020E8}.Release|x86.Build.0 = Release|x86
    312298  EndGlobalSection
    313299  GlobalSection(SolutionProperties) = preSolution

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Common/3.3/HeuristicLab.Hive.Client.Common-3.3.csproj

    r4075 r4076  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    … …  
    1616    <DelaySign>false</DelaySign>
    1717    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     18    <FileUpgradeFlags>
     19    </FileUpgradeFlags>
     20    <OldToolsVersion>3.5</OldToolsVersion>
     21    <UpgradeBackupLocation />
     22    <PublishUrl>publish\</PublishUrl>
     23    <Install>true</Install>
     24    <InstallFrom>Disk</InstallFrom>
     25    <UpdateEnabled>false</UpdateEnabled>
     26    <UpdateMode>Foreground</UpdateMode>
     27    <UpdateInterval>7</UpdateInterval>
     28    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     29    <UpdatePeriodically>false</UpdatePeriodically>
     30    <UpdateRequired>false</UpdateRequired>
     31    <MapFileExtensions>true</MapFileExtensions>
     32    <ApplicationRevision>0</ApplicationRevision>
     33    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     34    <IsWebBootstrapper>false</IsWebBootstrapper>
     35    <UseApplicationTrust>false</UseApplicationTrust>
     36    <BootstrapperEnabled>true</BootstrapperEnabled>
    1837  </PropertyGroup>
    1938  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    2544    <ErrorReport>prompt</ErrorReport>
    2645    <WarningLevel>4</WarningLevel>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2747  </PropertyGroup>
    2848  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3353    <ErrorReport>prompt</ErrorReport>
    3454    <WarningLevel>4</WarningLevel>
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3556  </PropertyGroup>
    3657  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    4162    <PlatformTarget>x86</PlatformTarget>
    4263    <ErrorReport>prompt</ErrorReport>
     64    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4365  </PropertyGroup>
    4466  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    … …  
    4971    <PlatformTarget>x86</PlatformTarget>
    5072    <ErrorReport>prompt</ErrorReport>
     73    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5174  </PropertyGroup>
    5275  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    … …  
    5780    <PlatformTarget>x64</PlatformTarget>
    5881    <ErrorReport>prompt</ErrorReport>
     82    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5983  </PropertyGroup>
    6084  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    … …  
    6589    <PlatformTarget>x64</PlatformTarget>
    6690    <ErrorReport>prompt</ErrorReport>
     91    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6792  </PropertyGroup>
    6893  <ItemGroup>
    … …  
    91116      <Name>HeuristicLab.Core-3.2</Name>
    92117    </ProjectReference>
    93     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     118    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    94119      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    95120      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    … …  
    111136    <Folder Include="Interfaces\" />
    112137  </ItemGroup>
     138  <ItemGroup>
     139    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     140      <Visible>False</Visible>
     141      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     142      <Install>false</Install>
     143    </BootstrapperPackage>
     144    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     145      <Visible>False</Visible>
     146      <ProductName>.NET Framework 3.5 SP1</ProductName>
     147      <Install>true</Install>
     148    </BootstrapperPackage>
     149    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     150      <Visible>False</Visible>
     151      <ProductName>Windows Installer 3.1</ProductName>
     152      <Install>true</Install>
     153    </BootstrapperPackage>
     154  </ItemGroup>
    113155  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    114156  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Communication/3.3/HeuristicLab.Hive.Client.Communication-3.3.csproj

    r4073 r4076  
    114114      <Name>HeuristicLab.Core-3.2</Name>
    115115    </ProjectReference>
    116     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    117       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    118       <Name>HeuristicLab.DataAccess-3.2</Name>
    119     </ProjectReference>
    120     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
    121       <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
    122       <Name>HeuristicLab.Hive.Client.Common-3.2</Name>
    123     </ProjectReference>
    124     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     116    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    125117      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    126118      <Name>HeuristicLab.Hive.Contracts-3.2</Name>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Console/3.3/HeuristicLab.Hive.Client.Console-3.3.csproj

    r4073 r4076  
    161161  </ItemGroup>
    162162  <ItemGroup>
    163     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     163    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    164164      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    165165      <Name>HeuristicLab.Hive.Contracts-3.2</Name>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs

    r4073 r4076  
    5757// by using the '*' as shown below:
    5858// [assembly: AssemblyVersion("1.0.*")]
    59 [assembly: AssemblyVersion("3.2.0.4071")]
    60 [assembly: AssemblyFileVersion("3.2.0.4071")]
    61 [assembly: AssemblyBuildDate("2010/07/22 10:11:18")]
     59[assembly: AssemblyVersion("3.2.0.4073")]
     60[assembly: AssemblyFileVersion("3.2.0.4073")]
     61[assembly: AssemblyBuildDate("2010/07/22 10:57:34")]

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.ExecutionEngine/3.3/Executor.cs

    r3931 r4076  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2623using HeuristicLab.Hive.Client.Common;
    27 using System.Xml;
    28 using System.Xml.Serialization;
    29 using System.IO;
    30 using HeuristicLab.Core;
    31 using HeuristicLab.Hive.JobBase;
    3224using HeuristicLab.Hive.Contracts;
    3325

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.ExecutionEngine/3.3/HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj

    r4074 r4076  
    7676  </PropertyGroup>
    7777  <ItemGroup>
     78    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     79      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     80    </Reference>
    7881    <Reference Include="System" />
    7982    <Reference Include="System.Core">
    … …  
    99102    <None Include="Properties\AssemblyInfo.frame" />
    100103  </ItemGroup>
    101   <ItemGroup>
    102     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    103       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    104       <Name>HeuristicLab.Core-3.2</Name>
    105     </ProjectReference>
    106     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
    107       <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
    108       <Name>HeuristicLab.Hive.Client.Common-3.2</Name>
    109     </ProjectReference>
    110     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Communication\3.3\HeuristicLab.Hive.Client.Communication-3.3.csproj">
    111       <Project>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</Project>
    112       <Name>HeuristicLab.Hive.Client.Communication-3.2</Name>
    113     </ProjectReference>
    114     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
    115       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    116       <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    117     </ProjectReference>
    118     <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.2\HeuristicLab.Hive.JobBase-3.2.csproj">
    119       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
    120       <Name>HeuristicLab.Hive.JobBase-3.2</Name>
    121     </ProjectReference>
    122     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    123       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    124       <Name>HeuristicLab.PluginInfrastructure</Name>
    125     </ProjectReference>
    126   </ItemGroup>
    127104  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    128105  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4074 r4076  
    138138  </ItemGroup>
    139139  <ItemGroup>
    140     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    141       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    142       <Name>HeuristicLab.Core-3.2</Name>
    143     </ProjectReference>
    144     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    145       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    146       <Name>HeuristicLab.DataAccess-3.2</Name>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    149       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    150       <Name>HeuristicLab.PluginInfrastructure</Name>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj">
    153       <Project>{EE2034D9-6E27-48A1-B855-42D45F69A4FC}</Project>
    154       <Name>HeuristicLab.Tracing-3.2</Name>
    155     </ProjectReference>
    156   </ItemGroup>
    157   <ItemGroup>
    158140    <None Include="HeuristicLab.snk" />
    159141    <None Include="Properties\AssemblyInfo.frame" />
    … …  
    163145      <SubType>Designer</SubType>
    164146    </EmbeddedResource>
     147  </ItemGroup>
     148  <ItemGroup>
     149    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     150      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     151      <Name>HeuristicLab.DataAccess-3.3</Name>
     152    </ProjectReference>
    165153  </ItemGroup>
    166154  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLab.Hive.Engine-3.3.csproj

    r4074 r4076  
    129129      <Name>HeuristicLab.Core-3.2</Name>
    130130    </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    132       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    133       <Name>HeuristicLab.DataAccess-3.2</Name>
    134     </ProjectReference>
    135131    <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
    136132      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj

    r4074 r4076  
    227227      <Name>HeuristicLab.Core-3.2</Name>
    228228    </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    230       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    231       <Name>HeuristicLab.DataAccess-3.2</Name>
    232     </ProjectReference>
    233229    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    234230      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs

    r4073 r4076  
    5555// by using the '*' as shown below:
    5656// [assembly: AssemblyVersion("1.0.*")]
    57 [assembly: AssemblyVersion("3.2.0.4071")]
    58 [assembly: AssemblyFileVersion("3.2.0.4071")]
    59 [assembly: AssemblyBuildDate("2010/07/22 10:11:19")]
     57[assembly: AssemblyVersion("3.2.0.4073")]
     58[assembly: AssemblyFileVersion("3.2.0.4073")]
     59[assembly: AssemblyBuildDate("2010/07/22 10:57:37")]

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj

    r4074 r4076  
    105105  </ItemGroup>
    106106  <ItemGroup>
    107     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    108       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    109       <Name>HeuristicLab.DataAccess-3.2</Name>
    110     </ProjectReference>
    111107    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    112108      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj

    r4074 r4076  
    119119  </ItemGroup>
    120120  <ItemGroup>
    121     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    122       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    123       <Name>HeuristicLab.DataAccess-3.2</Name>
    124     </ProjectReference>
    125121    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    126122      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Scheduler/3.3/HeuristicLab.Hive.Server.Scheduler-3.3.csproj

    r4074 r4076  
    102102      <Name>HeuristicLab.DataAccess.ADOHelper-3.2</Name>
    103103    </ProjectReference>
    104     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    105       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    106       <Name>HeuristicLab.DataAccess-3.2</Name>
    107     </ProjectReference>
    108104    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    109105      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj

    r4074 r4076  
    158158  </ItemGroup>
    159159  <ItemGroup>
    160     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    161       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    162       <Name>HeuristicLab.DataAccess-3.2</Name>
    163     </ProjectReference>
    164160    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    165161      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    … …  
    170166      <Name>HeuristicLab.Hive.Server.Core-3.2</Name>
    171167    </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Hive.Server.LINQDataAccess\3.2\HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj">
     168    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.LINQDataAccess\3.3\HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj">
    173169      <Project>{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}</Project>
    174170      <Name>HeuristicLab.Hive.Server.LINQDataAccess-3.2</Name>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Contracts/3.3/BusinessObjects/PersistableObject.cs

    r1449 r4076  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Text;
    2523using System.Runtime.Serialization;
    2624using HeuristicLab.DataAccess.Interfaces;
Note: See TracChangeset for help on using the changeset viewer.