Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4074


Ignore:
Timestamp:
07/22/10 10:40:07 (13 years ago)
Author:
cneumuel
Message:

resolving svn conflicts in 3.3-HiveMigration branch (#1091)

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

Legend:

Unmodified
Added
Removed
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4073 r4074  
    2929EndProject
    3030Project("{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}"
     31EndProject
     32Project("{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}"
     33EndProject
     34Project("{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}"
     35EndProject
     36Project("{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}"
     37EndProject
     38Project("{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}"
     39EndProject
     40Project("{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}"
     41EndProject
     42Project("{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}"
     43EndProject
     44Project("{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}"
     45EndProject
     46Project("{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}"
     47EndProject
     48Project("{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}"
     49EndProject
     50Project("{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}"
     51EndProject
     52Project("{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}"
    3153EndProject
    3254Global
     
    156178    {5CDACE54-5FB2-4344-A21C-963F63CB7C2B}.Release|x86.ActiveCfg = Release|x86
    157179    {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
     192    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     193    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
     194    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.ActiveCfg = Debug|x64
     195    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x64.Build.0 = Debug|x64
     196    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.ActiveCfg = Debug|x86
     197    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|x86.Build.0 = Debug|x86
     198    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
     199    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.Build.0 = Release|Any CPU
     200    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.ActiveCfg = Release|x64
     201    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x64.Build.0 = Release|x64
     202    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|x86
     203    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.Build.0 = Release|x86
     204    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     205    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     206    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.ActiveCfg = Debug|x64
     207    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x64.Build.0 = Debug|x64
     208    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
     209    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86
     210    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     211    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|Any CPU.Build.0 = Release|Any CPU
     212    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.ActiveCfg = Release|x64
     213    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x64.Build.0 = Release|x64
     214    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.ActiveCfg = Release|x86
     215    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Release|x86.Build.0 = Release|x86
     216    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     217    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.Build.0 = Debug|Any CPU
     218    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.ActiveCfg = Debug|x64
     219    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x64.Build.0 = Debug|x64
     220    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|x86
     221    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.Build.0 = Debug|x86
     222    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
     223    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
     224    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.ActiveCfg = Release|x64
     225    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x64.Build.0 = Release|x64
     226    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
     227    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
     228    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     229    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     230    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|x64.ActiveCfg = Debug|x64
     231    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|x64.Build.0 = Debug|x64
     232    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|x86.ActiveCfg = Debug|x86
     233    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Debug|x86.Build.0 = Debug|x86
     234    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     235    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|Any CPU.Build.0 = Release|Any CPU
     236    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|x64.ActiveCfg = Release|x64
     237    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|x64.Build.0 = Release|x64
     238    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|x86.ActiveCfg = Release|x86
     239    {134F93D7-E7C8-4ECD-9923-7F63259A60D8}.Release|x86.Build.0 = Release|x86
     240    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     241    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|Any CPU.Build.0 = Debug|Any CPU
     242    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|x64.ActiveCfg = Debug|x64
     243    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|x64.Build.0 = Debug|x64
     244    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|x86.ActiveCfg = Debug|x86
     245    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|x86.Build.0 = Debug|x86
     246    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Release|Any CPU.ActiveCfg = Release|Any CPU
     247    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Release|Any CPU.Build.0 = Release|Any CPU
     248    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Release|x64.ActiveCfg = Release|x64
     249    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Release|x64.Build.0 = Release|x64
     250    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Release|x86.ActiveCfg = Release|x86
     251    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Release|x86.Build.0 = Release|x86
     252    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     253    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|Any CPU.Build.0 = Debug|Any CPU
     254    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|x64.ActiveCfg = Debug|x64
     255    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|x64.Build.0 = Debug|x64
     256    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|x86.ActiveCfg = Debug|x86
     257    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Debug|x86.Build.0 = Debug|x86
     258    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|Any CPU.ActiveCfg = Release|Any CPU
     259    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|Any CPU.Build.0 = Release|Any CPU
     260    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|x64.ActiveCfg = Release|x64
     261    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|x64.Build.0 = Release|x64
     262    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|x86.ActiveCfg = Release|x86
     263    {A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}.Release|x86.Build.0 = Release|x86
     264    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     265    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|Any CPU.Build.0 = Debug|Any CPU
     266    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|x64.ActiveCfg = Debug|x64
     267    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|x64.Build.0 = Debug|x64
     268    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|x86.ActiveCfg = Debug|x86
     269    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|x86.Build.0 = Debug|x86
     270    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|Any CPU.ActiveCfg = Release|Any CPU
     271    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|Any CPU.Build.0 = Release|Any CPU
     272    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|x64.ActiveCfg = Release|x64
     273    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|x64.Build.0 = Release|x64
     274    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|x86.ActiveCfg = Release|x86
     275    {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|x86.Build.0 = Release|x86
     276    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     277    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Debug|Any CPU.Build.0 = Debug|Any CPU
     278    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Debug|x64.ActiveCfg = Debug|x64
     279    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Debug|x64.Build.0 = Debug|x64
     280    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Debug|x86.ActiveCfg = Debug|x86
     281    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Debug|x86.Build.0 = Debug|x86
     282    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Release|Any CPU.ActiveCfg = Release|Any CPU
     283    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Release|Any CPU.Build.0 = Release|Any CPU
     284    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Release|x64.ActiveCfg = Release|x64
     285    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Release|x64.Build.0 = Release|x64
     286    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Release|x86.ActiveCfg = Release|x86
     287    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Release|x86.Build.0 = Release|x86
     288    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     289    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
     290    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Debug|x64.ActiveCfg = Debug|x64
     291    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Debug|x64.Build.0 = Debug|x64
     292    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Debug|x86.ActiveCfg = Debug|x86
     293    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Debug|x86.Build.0 = Debug|x86
     294    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
     295    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Release|Any CPU.Build.0 = Release|Any CPU
     296    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Release|x64.ActiveCfg = Release|x64
     297    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Release|x64.Build.0 = Release|x64
     298    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Release|x86.ActiveCfg = Release|x86
     299    {A4499DDD-D1B8-414F-98F6-903C2C71BEB0}.Release|x86.Build.0 = Release|x86
     300    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     301    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     302    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|x64.ActiveCfg = Debug|x64
     303    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|x64.Build.0 = Debug|x64
     304    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|x86.ActiveCfg = Debug|x86
     305    {679E977A-117B-456E-8594-2A4DEADB658B}.Debug|x86.Build.0 = Debug|x86
     306    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|Any CPU.ActiveCfg = Release|Any CPU
     307    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|Any CPU.Build.0 = Release|Any CPU
     308    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|x64.ActiveCfg = Release|x64
     309    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|x64.Build.0 = Release|x64
     310    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|x86.ActiveCfg = Release|x86
     311    {679E977A-117B-456E-8594-2A4DEADB658B}.Release|x86.Build.0 = Release|x86
    158312  EndGlobalSection
    159313  GlobalSection(SolutionProperties) = preSolution
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.ExecutionEngine/3.3/HeuristicLab.Hive.Client.ExecutionEngine-3.3.csproj

    r4057 r4074  
    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    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
    1721  </PropertyGroup>
    1822  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2428    <ErrorReport>prompt</ErrorReport>
    2529    <WarningLevel>4</WarningLevel>
     30    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2631  </PropertyGroup>
    2732  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3237    <ErrorReport>prompt</ErrorReport>
    3338    <WarningLevel>4</WarningLevel>
     39    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3440  </PropertyGroup>
    3541  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4046    <PlatformTarget>x86</PlatformTarget>
    4147    <ErrorReport>prompt</ErrorReport>
     48    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4249  </PropertyGroup>
    4350  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    4855    <PlatformTarget>x86</PlatformTarget>
    4956    <ErrorReport>prompt</ErrorReport>
     57    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5058  </PropertyGroup>
    5159  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5664    <PlatformTarget>x64</PlatformTarget>
    5765    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5867  </PropertyGroup>
    5968  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6473    <PlatformTarget>x64</PlatformTarget>
    6574    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6676  </PropertyGroup>
    6777  <ItemGroup>
     
    94104      <Name>HeuristicLab.Core-3.2</Name>
    95105    </ProjectReference>
    96     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.2\HeuristicLab.Hive.Client.Common-3.2.csproj">
     106    <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Common\3.3\HeuristicLab.Hive.Client.Common-3.3.csproj">
    97107      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
    98108      <Name>HeuristicLab.Hive.Client.Common-3.2</Name>
    99109    </ProjectReference>
    100     <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Communication\3.2\HeuristicLab.Hive.Client.Communication-3.2.csproj">
     110    <ProjectReference Include="..\..\HeuristicLab.Hive.Client.Communication\3.3\HeuristicLab.Hive.Client.Communication-3.3.csproj">
    101111      <Project>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</Project>
    102112      <Name>HeuristicLab.Hive.Client.Communication-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4057 r4074  
    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    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
    1721  </PropertyGroup>
    1822  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2428    <ErrorReport>prompt</ErrorReport>
    2529    <WarningLevel>4</WarningLevel>
     30    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2631  </PropertyGroup>
    2732  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3237    <ErrorReport>prompt</ErrorReport>
    3338    <WarningLevel>4</WarningLevel>
     39    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3440  </PropertyGroup>
    3541  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4046    <PlatformTarget>x86</PlatformTarget>
    4147    <ErrorReport>prompt</ErrorReport>
     48    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4249  </PropertyGroup>
    4350  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    4855    <PlatformTarget>x86</PlatformTarget>
    4956    <ErrorReport>prompt</ErrorReport>
     57    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5058  </PropertyGroup>
    5159  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5664    <PlatformTarget>x64</PlatformTarget>
    5765    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5867  </PropertyGroup>
    5968  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6473    <PlatformTarget>x64</PlatformTarget>
    6574    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6676  </PropertyGroup>
    6777  <ItemGroup>
     
    132142      <Name>HeuristicLab.Core-3.2</Name>
    133143    </ProjectReference>
    134     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     144    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    135145      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    136146      <Name>HeuristicLab.DataAccess-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLab.Hive.Engine-3.3.csproj

    r4057 r4074  
    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    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
     21    <PublishUrl>publish\</PublishUrl>
     22    <Install>true</Install>
     23    <InstallFrom>Disk</InstallFrom>
     24    <UpdateEnabled>false</UpdateEnabled>
     25    <UpdateMode>Foreground</UpdateMode>
     26    <UpdateInterval>7</UpdateInterval>
     27    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     28    <UpdatePeriodically>false</UpdatePeriodically>
     29    <UpdateRequired>false</UpdateRequired>
     30    <MapFileExtensions>true</MapFileExtensions>
     31    <ApplicationRevision>0</ApplicationRevision>
     32    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     33    <IsWebBootstrapper>false</IsWebBootstrapper>
     34    <UseApplicationTrust>false</UseApplicationTrust>
     35    <BootstrapperEnabled>true</BootstrapperEnabled>
    1736  </PropertyGroup>
    1837  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2443    <ErrorReport>prompt</ErrorReport>
    2544    <WarningLevel>4</WarningLevel>
     45    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2646  </PropertyGroup>
    2747  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3252    <ErrorReport>prompt</ErrorReport>
    3353    <WarningLevel>4</WarningLevel>
     54    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3455  </PropertyGroup>
    3556  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4061    <PlatformTarget>x86</PlatformTarget>
    4162    <ErrorReport>prompt</ErrorReport>
     63    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4264  </PropertyGroup>
    4365  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    4870    <PlatformTarget>x86</PlatformTarget>
    4971    <ErrorReport>prompt</ErrorReport>
     72    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5073  </PropertyGroup>
    5174  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5679    <PlatformTarget>x64</PlatformTarget>
    5780    <ErrorReport>prompt</ErrorReport>
     81    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5882  </PropertyGroup>
    5983  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6488    <PlatformTarget>x64</PlatformTarget>
    6589    <ErrorReport>prompt</ErrorReport>
     90    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6691  </PropertyGroup>
    6792  <ItemGroup>
     
    88113    <Compile Include="HeuristicLabHiveEnginePlugin.cs" />
    89114    <Compile Include="HiveEngine.cs" />
    90     <Compile Include="HiveEngineEditor.cs">
    91       <SubType>UserControl</SubType>
    92     </Compile>
     115    <Compile Include="HiveEngineEditor.cs" />
    93116    <Compile Include="HiveEngineEditor.Designer.cs">
    94117      <DependentUpon>HiveEngineEditor.cs</DependentUpon>
     
    106129      <Name>HeuristicLab.Core-3.2</Name>
    107130    </ProjectReference>
    108     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     131    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    109132      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    110133      <Name>HeuristicLab.DataAccess-3.2</Name>
     
    114137      <Name>HeuristicLab.Data-3.2</Name>
    115138    </ProjectReference>
    116     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     139    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    117140      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    118141      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
     
    144167      <SubType>Designer</SubType>
    145168    </EmbeddedResource>
     169  </ItemGroup>
     170  <ItemGroup>
     171    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     172      <Visible>False</Visible>
     173      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     174      <Install>false</Install>
     175    </BootstrapperPackage>
     176    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     177      <Visible>False</Visible>
     178      <ProductName>.NET Framework 3.5 SP1</ProductName>
     179      <Install>true</Install>
     180    </BootstrapperPackage>
     181    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     182      <Visible>False</Visible>
     183      <ProductName>Windows Installer 3.1</ProductName>
     184      <Install>true</Install>
     185    </BootstrapperPackage>
    146186  </ItemGroup>
    147187  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj

    r4057 r4074  
    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>
     
    1717    <StartupObject>
    1818    </StartupObject>
     19    <FileUpgradeFlags>
     20    </FileUpgradeFlags>
     21    <OldToolsVersion>3.5</OldToolsVersion>
     22    <UpgradeBackupLocation />
    1923  </PropertyGroup>
    2024  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2630    <ErrorReport>prompt</ErrorReport>
    2731    <WarningLevel>4</WarningLevel>
     32    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2833  </PropertyGroup>
    2934  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3439    <ErrorReport>prompt</ErrorReport>
    3540    <WarningLevel>4</WarningLevel>
     41    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3642  </PropertyGroup>
    3743  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4248    <PlatformTarget>x86</PlatformTarget>
    4349    <ErrorReport>prompt</ErrorReport>
     50    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4451  </PropertyGroup>
    4552  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    5057    <PlatformTarget>x86</PlatformTarget>
    5158    <ErrorReport>prompt</ErrorReport>
     59    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5260  </PropertyGroup>
    5361  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5866    <PlatformTarget>x64</PlatformTarget>
    5967    <ErrorReport>prompt</ErrorReport>
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6069  </PropertyGroup>
    6170  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6675    <PlatformTarget>x64</PlatformTarget>
    6776    <ErrorReport>prompt</ErrorReport>
     77    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6878  </PropertyGroup>
    6979  <ItemGroup>
     
    217227      <Name>HeuristicLab.Core-3.2</Name>
    218228    </ProjectReference>
    219     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     229    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    220230      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    221231      <Name>HeuristicLab.DataAccess-3.2</Name>
    222232    </ProjectReference>
    223     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     233    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    224234      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    225235      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Properties/Resources.Designer.cs

    r1089 r4074  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3053
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen
    2121    // with the /str option, or rebuild your VS project.
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Properties/Settings.Designer.cs

    r1089 r4074  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3053
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj

    r4057 r4074  
    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>
     
    1717    <SignAssembly>true</SignAssembly>
    1818    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     19    <FileUpgradeFlags>
     20    </FileUpgradeFlags>
     21    <OldToolsVersion>3.5</OldToolsVersion>
     22    <UpgradeBackupLocation />
    1923  </PropertyGroup>
    2024  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2630    <ErrorReport>prompt</ErrorReport>
    2731    <WarningLevel>4</WarningLevel>
     32    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2833  </PropertyGroup>
    2934  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3439    <ErrorReport>prompt</ErrorReport>
    3540    <WarningLevel>4</WarningLevel>
     41    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3642  </PropertyGroup>
    3743  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4248    <PlatformTarget>x86</PlatformTarget>
    4349    <ErrorReport>prompt</ErrorReport>
     50    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4451  </PropertyGroup>
    4552  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    5057    <PlatformTarget>x86</PlatformTarget>
    5158    <ErrorReport>prompt</ErrorReport>
     59    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5260  </PropertyGroup>
    5361  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5866    <PlatformTarget>x64</PlatformTarget>
    5967    <ErrorReport>prompt</ErrorReport>
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6069  </PropertyGroup>
    6170  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6675    <PlatformTarget>x64</PlatformTarget>
    6776    <ErrorReport>prompt</ErrorReport>
     77    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6878  </PropertyGroup>
    6979  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     
    95105  </ItemGroup>
    96106  <ItemGroup>
    97     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     107    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    98108      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    99109      <Name>HeuristicLab.DataAccess-3.2</Name>
    100110    </ProjectReference>
    101     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     111    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    102112      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    103113      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs

    r3931 r4074  
    1919        if (_hiveDataContext == null) {
    2020          Logger.Debug("Requested new Data Context");
    21           _hiveDataContext = new HiveDataContext("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq.Test;Integrated Security=SSPI");
     21          _hiveDataContext = new HiveDataContext("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive;Integrated Security=SSPI");
    2222          _hiveDataContext.CommandTimeout = 240;
    2323        }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj

    r4057 r4074  
    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    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
    1721  </PropertyGroup>
    1822  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2529    <WarningLevel>4</WarningLevel>
    2630    <PlatformTarget>AnyCPU</PlatformTarget>
     31    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2732  </PropertyGroup>
    2833  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3338    <ErrorReport>prompt</ErrorReport>
    3439    <WarningLevel>4</WarningLevel>
     40    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3541  </PropertyGroup>
    3642  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4147    <PlatformTarget>x86</PlatformTarget>
    4248    <ErrorReport>prompt</ErrorReport>
     49    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4350  </PropertyGroup>
    4451  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    4956    <PlatformTarget>x86</PlatformTarget>
    5057    <ErrorReport>prompt</ErrorReport>
     58    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5159  </PropertyGroup>
    5260  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5765    <PlatformTarget>x64</PlatformTarget>
    5866    <ErrorReport>prompt</ErrorReport>
     67    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5968  </PropertyGroup>
    6069  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6574    <PlatformTarget>x64</PlatformTarget>
    6675    <ErrorReport>prompt</ErrorReport>
     76    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6777  </PropertyGroup>
    6878  <ItemGroup>
     
    109119  </ItemGroup>
    110120  <ItemGroup>
    111     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     121    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    112122      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    113123      <Name>HeuristicLab.DataAccess-3.2</Name>
    114124    </ProjectReference>
    115     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     125    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    116126      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    117127      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    118128    </ProjectReference>
    119     <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.2\HeuristicLab.Hive.Server.DataAccess-3.2.csproj">
     129    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.3\HeuristicLab.Hive.Server.DataAccess-3.3.csproj">
    120130      <Project>{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}</Project>
    121131      <Name>HeuristicLab.Hive.Server.DataAccess-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/Hive.designer.cs

    r3931 r4074  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:2.0.50727.4927
     5//     Runtime Version:2.0.50727.3603
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/Properties/Settings.Designer.cs

    r3931 r4074  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.4927
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Scheduler/3.3/HeuristicLab.Hive.Server.Scheduler-3.3.csproj

    r4057 r4074  
    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    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
    1721  </PropertyGroup>
    1822  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2428    <ErrorReport>prompt</ErrorReport>
    2529    <WarningLevel>4</WarningLevel>
     30    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2631  </PropertyGroup>
    2732  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3237    <ErrorReport>prompt</ErrorReport>
    3338    <WarningLevel>4</WarningLevel>
     39    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3440  </PropertyGroup>
    3541  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4046    <PlatformTarget>x86</PlatformTarget>
    4147    <ErrorReport>prompt</ErrorReport>
     48    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4249  </PropertyGroup>
    4350  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    4855    <PlatformTarget>x86</PlatformTarget>
    4956    <ErrorReport>prompt</ErrorReport>
     57    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5058  </PropertyGroup>
    5159  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5664    <PlatformTarget>x64</PlatformTarget>
    5765    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5867  </PropertyGroup>
    5968  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6473    <PlatformTarget>x64</PlatformTarget>
    6574    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6676  </PropertyGroup>
    6777  <ItemGroup>
     
    8898  </ItemGroup>
    8999  <ItemGroup>
    90     <ProjectReference Include="..\..\HeuristicLab.DataAccess.ADOHelper\3.2\HeuristicLab.DataAccess.ADOHelper-3.2.csproj">
     100    <ProjectReference Include="..\..\HeuristicLab.DataAccess.ADOHelper\3.3\HeuristicLab.DataAccess.ADOHelper-3.3.csproj">
    91101      <Project>{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}</Project>
    92102      <Name>HeuristicLab.DataAccess.ADOHelper-3.2</Name>
    93103    </ProjectReference>
    94     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     104    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    95105      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    96106      <Name>HeuristicLab.DataAccess-3.2</Name>
    97107    </ProjectReference>
    98     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     108    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    99109      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    100110      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    101111    </ProjectReference>
    102     <ProjectReference Include="..\..\HeuristicLab.Hive.Server.Core\3.2\HeuristicLab.Hive.Server.Core-3.2.csproj">
     112    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.Core\3.3\HeuristicLab.Hive.Server.Core-3.3.csproj">
    103113      <Project>{898B31CF-81DC-453B-AEB3-BDF83197A7EE}</Project>
    104114      <Name>HeuristicLab.Hive.Server.Core-3.2</Name>
    105115    </ProjectReference>
    106     <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.2\HeuristicLab.Hive.Server.DataAccess-3.2.csproj">
     116    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.DataAccess\3.3\HeuristicLab.Hive.Server.DataAccess-3.3.csproj">
    107117      <Project>{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}</Project>
    108118      <Name>HeuristicLab.Hive.Server.DataAccess-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj

    r4057 r4074  
    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>
     
    1717    <SignAssembly>true</SignAssembly>
    1818    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     19    <FileUpgradeFlags>
     20    </FileUpgradeFlags>
     21    <OldToolsVersion>3.5</OldToolsVersion>
     22    <UpgradeBackupLocation />
    1923  </PropertyGroup>
    2024  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2630    <ErrorReport>prompt</ErrorReport>
    2731    <WarningLevel>4</WarningLevel>
     32    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2833  </PropertyGroup>
    2934  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3439    <ErrorReport>prompt</ErrorReport>
    3540    <WarningLevel>4</WarningLevel>
     41    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3642  </PropertyGroup>
    3743  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4248    <PlatformTarget>x86</PlatformTarget>
    4349    <ErrorReport>prompt</ErrorReport>
     50    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4451  </PropertyGroup>
    4552  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    5057    <PlatformTarget>x86</PlatformTarget>
    5158    <ErrorReport>prompt</ErrorReport>
     59    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5260  </PropertyGroup>
    5361  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    5866    <PlatformTarget>x64</PlatformTarget>
    5967    <ErrorReport>prompt</ErrorReport>
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6069  </PropertyGroup>
    6170  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    6675    <PlatformTarget>x64</PlatformTarget>
    6776    <ErrorReport>prompt</ErrorReport>
     77    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6878  </PropertyGroup>
    6979  <ItemGroup>
     
    148158  </ItemGroup>
    149159  <ItemGroup>
    150     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     160    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    151161      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    152162      <Name>HeuristicLab.DataAccess-3.2</Name>
    153163    </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     164    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    155165      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    156166      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    157167    </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Hive.Server.Core\3.2\HeuristicLab.Hive.Server.Core-3.2.csproj">
     168    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.Core\3.3\HeuristicLab.Hive.Server.Core-3.3.csproj">
    159169      <Project>{898B31CF-81DC-453B-AEB3-BDF83197A7EE}</Project>
    160170      <Name>HeuristicLab.Hive.Server.Core-3.2</Name>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/Properties/Resources.Designer.cs

    r2065 r4074  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3082
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen
    2121    // with the /str option, or rebuild your VS project.
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/Properties/Settings.Designer.cs

    r713 r4074  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3053
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Server.Properties
    12 {
    13 
    14 
     11namespace HeuristicLab.Hive.Server.Properties {
     12   
     13   
    1514    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    16     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
    17     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
    18     {
    19 
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     16    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
     17       
    2018        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
    21 
    22         public static Settings Default
    23         {
    24             get
    25             {
     19       
     20        public static Settings Default {
     21            get {
    2622                return defaultInstance;
    2723            }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.ADODataAccess/3.3/HeuristicLab.Security.ADODataAccess-3.3.csproj

    r4073 r4074  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<<<<<<< .mine
     2<?xml version="1.0" encoding="utf-8"?>
    23<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    34  <PropertyGroup>
     
    186187    </BootstrapperPackage>
    187188  </ItemGroup>
    188 </Project>
     189  <ItemGroup>
     190    <ProjectReference Include="..\..\HeuristicLab.DataAccess.ADOHelper\3.3\HeuristicLab.DataAccess.ADOHelper-3.3.csproj">
     191      <Project>{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}</Project>
     192      <Name>HeuristicLab.DataAccess.ADOHelper-3.3</Name>
     193    </ProjectReference>
     194    <ProjectReference Include="..\..\HeuristicLab.Security.Contracts\3.3\HeuristicLab.Security.Contracts-3.3.csproj">
     195      <Project>{D59E852C-F205-4647-8C05-EB9ED1CF44E9}</Project>
     196      <Name>HeuristicLab.Security.Contracts-3.3</Name>
     197    </ProjectReference>
     198  </ItemGroup>
     199</Project>=======
     200<?xml version="1.0" encoding="utf-8"?>
     201<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     202  <PropertyGroup>
     203    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     204    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     205    <ProductVersion>9.0.30729</ProductVersion>
     206    <SchemaVersion>2.0</SchemaVersion>
     207    <ProjectGuid>{FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}</ProjectGuid>
     208    <OutputType>Library</OutputType>
     209    <AppDesignerFolder>Properties</AppDesignerFolder>
     210    <RootNamespace>HeuristicLab.Security.ADODataAccess</RootNamespace>
     211    <AssemblyName>HeuristicLab.Security.ADODataAccess-3.2</AssemblyName>
     212    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     213    <FileAlignment>512</FileAlignment>
     214    <StartupObject>
     215    </StartupObject>
     216    <SignAssembly>true</SignAssembly>
     217    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     218    <FileUpgradeFlags>
     219    </FileUpgradeFlags>
     220    <UpgradeBackupLocation>
     221    </UpgradeBackupLocation>
     222    <OldToolsVersion>3.5</OldToolsVersion>
     223    <PublishUrl>publish\</PublishUrl>
     224    <Install>true</Install>
     225    <InstallFrom>Disk</InstallFrom>
     226    <UpdateEnabled>false</UpdateEnabled>
     227    <UpdateMode>Foreground</UpdateMode>
     228    <UpdateInterval>7</UpdateInterval>
     229    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     230    <UpdatePeriodically>false</UpdatePeriodically>
     231    <UpdateRequired>false</UpdateRequired>
     232    <MapFileExtensions>true</MapFileExtensions>
     233    <ApplicationRevision>0</ApplicationRevision>
     234    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     235    <IsWebBootstrapper>false</IsWebBootstrapper>
     236    <UseApplicationTrust>false</UseApplicationTrust>
     237    <BootstrapperEnabled>true</BootstrapperEnabled>
     238  </PropertyGroup>
     239  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     240    <DebugSymbols>true</DebugSymbols>
     241    <DebugType>full</DebugType>
     242    <Optimize>false</Optimize>
     243    <OutputPath>bin\Debug\</OutputPath>
     244    <DefineConstants>DEBUG;TRACE</DefineConstants>
     245    <ErrorReport>prompt</ErrorReport>
     246    <WarningLevel>4</WarningLevel>
     247    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     248  </PropertyGroup>
     249  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     250    <DebugType>pdbonly</DebugType>
     251    <Optimize>true</Optimize>
     252    <OutputPath>bin\Release\</OutputPath>
     253    <DefineConstants>TRACE</DefineConstants>
     254    <ErrorReport>prompt</ErrorReport>
     255    <WarningLevel>4</WarningLevel>
     256    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     257  </PropertyGroup>
     258  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     259    <DebugSymbols>true</DebugSymbols>
     260    <OutputPath>bin\x86\Debug\</OutputPath>
     261    <DefineConstants>DEBUG;TRACE</DefineConstants>
     262    <DebugType>full</DebugType>
     263    <PlatformTarget>x86</PlatformTarget>
     264    <ErrorReport>prompt</ErrorReport>
     265    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     266  </PropertyGroup>
     267  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     268    <OutputPath>bin\x86\Release\</OutputPath>
     269    <DefineConstants>TRACE</DefineConstants>
     270    <Optimize>true</Optimize>
     271    <DebugType>pdbonly</DebugType>
     272    <PlatformTarget>x86</PlatformTarget>
     273    <ErrorReport>prompt</ErrorReport>
     274    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     275  </PropertyGroup>
     276  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     277    <DebugSymbols>true</DebugSymbols>
     278    <OutputPath>bin\x64\Debug\</OutputPath>
     279    <DefineConstants>DEBUG;TRACE</DefineConstants>
     280    <DebugType>full</DebugType>
     281    <PlatformTarget>x64</PlatformTarget>
     282    <ErrorReport>prompt</ErrorReport>
     283    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     284  </PropertyGroup>
     285  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     286    <OutputPath>bin\x64\Release\</OutputPath>
     287    <DefineConstants>TRACE</DefineConstants>
     288    <Optimize>true</Optimize>
     289    <DebugType>pdbonly</DebugType>
     290    <PlatformTarget>x64</PlatformTarget>
     291    <ErrorReport>prompt</ErrorReport>
     292    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     293  </PropertyGroup>
     294  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     295  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     296       Other similar extension points exist, see Microsoft.Common.targets.
     297  <Target Name="BeforeBuild">
     298  </Target>
     299  <Target Name="AfterBuild">
     300  </Target>
     301  -->
     302  <ItemGroup>
     303    <None Include="app.config" />
     304    <None Include="datamodel_security_sqlserver.erwin" />
     305    <None Include="dsSecurity.xsc">
     306      <DependentUpon>dsSecurity.xsd</DependentUpon>
     307    </None>
     308    <None Include="dsSecurity.xsd">
     309      <SubType>Designer</SubType>
     310      <Generator>MSDataSetGenerator</Generator>
     311      <LastGenOutput>dsSecurity.Designer.cs</LastGenOutput>
     312    </None>
     313    <None Include="dsSecurity.xss">
     314      <DependentUpon>dsSecurity.xsd</DependentUpon>
     315    </None>
     316    <None Include="HeuristicLab.snk" />
     317    <None Include="Properties\AssemblyInfo.frame" />
     318    <None Include="Properties\Settings.settings">
     319      <Generator>SettingsSingleFileGenerator</Generator>
     320      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     321    </None>
     322  </ItemGroup>
     323  <PropertyGroup>
     324    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     325set ProjectDir=$(ProjectDir)
     326set SolutionDir=$(SolutionDir)
     327set Outdir=$(Outdir)
     328
     329call PreBuildEvent.cmd</PreBuildEvent>
     330  </PropertyGroup>
     331  <ItemGroup>
     332    <Compile Include="ADODataAccessPlugin.cs" />
     333    <Compile Include="dsSecurity.cs">
     334      <DependentUpon>dsSecurity.xsd</DependentUpon>
     335      <SubType>Component</SubType>
     336    </Compile>
     337    <Compile Include="TableAdapterWrapper\GrantedPermissionsAdapterWrapper.cs" />
     338    <Compile Include="TableAdapterWrapper\PermissionOwner_UserGroupAdapterWrapper.cs" />
     339    <Compile Include="UserGroupAdapter.cs" />
     340    <Compile Include="HLUserAdapter.cs" />
     341    <Compile Include="PermissionOwnerAdapter.cs" />
     342    <Compile Include="dsSecurity.Designer.cs">
     343      <AutoGen>True</AutoGen>
     344      <DesignTime>True</DesignTime>
     345      <DependentUpon>dsSecurity.xsd</DependentUpon>
     346    </Compile>
     347    <Compile Include="PermissionAdapter.cs" />
     348    <Compile Include="Properties\AssemblyInfo.cs" />
     349    <Compile Include="Properties\Settings.Designer.cs">
     350      <AutoGen>True</AutoGen>
     351      <DesignTimeSharedInput>True</DesignTimeSharedInput>
     352      <DependentUpon>Settings.settings</DependentUpon>
     353    </Compile>
     354    <Compile Include="TableAdapterWrapper\UserGroupAdapterWrapper.cs" />
     355    <Compile Include="TableAdapterWrapper\HLUserAdapterWrapper.cs" />
     356    <Compile Include="TableAdapterWrapper\PermissionOwnerAdapterWrapper.cs" />
     357    <Compile Include="TableAdapterWrapper\PermissionAdapterWrapper.cs" />
     358  </ItemGroup>
     359  <ItemGroup>
     360    <Reference Include="System" />
     361    <Reference Include="System.Core">
     362      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     363    </Reference>
     364    <Reference Include="System.Data" />
     365    <Reference Include="System.Data.DataSetExtensions">
     366      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     367    </Reference>
     368    <Reference Include="System.Xml" />
     369  </ItemGroup>
     370  <ItemGroup>
     371    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     372      <Visible>False</Visible>
     373      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     374      <Install>false</Install>
     375    </BootstrapperPackage>
     376    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     377      <Visible>False</Visible>
     378      <ProductName>.NET Framework 3.5 SP1</ProductName>
     379      <Install>true</Install>
     380    </BootstrapperPackage>
     381    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     382      <Visible>False</Visible>
     383      <ProductName>Windows Installer 3.1</ProductName>
     384      <Install>true</Install>
     385    </BootstrapperPackage>
     386  </ItemGroup>
     387</Project>>>>>>>> .r4073
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Core/3.3/HeuristicLab.Security.Core-3.3.csproj

    r4073 r4074  
    9191  </PropertyGroup>
    9292  <ItemGroup>
     93    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     94      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     95    </Reference>
     96    <Reference Include="HeuristicLab.Security.Contracts-3.2, Version=3.2.0.4072, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     97      <SpecificVersion>False</SpecificVersion>
     98      <HintPath>..\..\HeuristicLab.Security.Contracts\3.3\bin\Debug\HeuristicLab.Security.Contracts-3.2.dll</HintPath>
     99    </Reference>
    93100    <Reference Include="System" />
    94101    <Reference Include="System.Core">
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.DataAccess/3.3/HeuristicLab.Security.DataAccess-3.3.csproj

    r4073 r4074  
    142142    </BootstrapperPackage>
    143143  </ItemGroup>
     144  <ItemGroup>
     145    <ProjectReference Include="..\..\HeuristicLab.Security.Contracts\3.3\HeuristicLab.Security.Contracts-3.3.csproj">
     146      <Project>{D59E852C-F205-4647-8C05-EB9ED1CF44E9}</Project>
     147      <Name>HeuristicLab.Security.Contracts-3.3</Name>
     148    </ProjectReference>
     149  </ItemGroup>
    144150</Project>
Note: See TracChangeset for help on using the changeset viewer.