Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (13 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources

    • Property svn:ignore

      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
        … …  
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865

  • trunk/sources/HeuristicLab.Services.Deployment/3.3/HeuristicLab.Services.Deployment-3.3.csproj

    r5163 r6866  
    2626    <DebugType>full</DebugType>
    2727    <Optimize>false</Optimize>
    28     <OutputPath>bin\Debug\</OutputPath>
     28    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2929    <DefineConstants>DEBUG;TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
    … …  
    3535    <DebugType>pdbonly</DebugType>
    3636    <Optimize>true</Optimize>
    37     <OutputPath>bin\Release\</OutputPath>
     37    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3838    <DefineConstants>TRACE</DefineConstants>
    3939    <ErrorReport>prompt</ErrorReport>
    … …  
    4343  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    4444    <DebugSymbols>true</DebugSymbols>
    45     <OutputPath>bin\x86\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4646    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4747    <DebugType>full</DebugType>
    … …  
    5151  </PropertyGroup>
    5252  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    53     <OutputPath>bin\x86\Release\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <Optimize>true</Optimize>
    … …  
    6161  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6262    <DebugSymbols>true</DebugSymbols>
    63     <OutputPath>bin\x64\Debug\</OutputPath>
     63    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6464    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6565    <DebugType>full</DebugType>
    … …  
    6969  </PropertyGroup>
    7070  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    71     <OutputPath>bin\x64\Release\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7272    <DefineConstants>TRACE</DefineConstants>
    7373    <Optimize>true</Optimize>
    … …  
    134134      <Project>{EBEBA863-DD05-4331-BE25-5758B15F7407}</Project>
    135135      <Name>HeuristicLab.Services.Deployment.DataAccess-3.3</Name>
    136     </ProjectReference>
     136  <Private>False</Private></ProjectReference>
    137137  </ItemGroup>
    138138  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Services.Deployment/3.3/Tests/HeuristicLab.Services.Deployment-3.3.Tests.csproj

    r4065 r6866  
    3838    <DebugType>full</DebugType>
    3939    <Optimize>false</Optimize>
    40     <OutputPath>bin\Debug\</OutputPath>
     40    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4141    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4242    <ErrorReport>prompt</ErrorReport>
    … …  
    4747    <DebugType>pdbonly</DebugType>
    4848    <Optimize>true</Optimize>
    49     <OutputPath>bin\Release\</OutputPath>
     49    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5050    <DefineConstants>TRACE</DefineConstants>
    5151    <ErrorReport>prompt</ErrorReport>
    … …  
    5555  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5656    <DebugSymbols>true</DebugSymbols>
    57     <OutputPath>bin\x64\Debug\</OutputPath>
     57    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5858    <DefineConstants>DEBUG;TRACE</DefineConstants>
    5959    <DebugType>full</DebugType>
    … …  
    6363  </PropertyGroup>
    6464  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    65     <OutputPath>bin\x64\Release\</OutputPath>
     65    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6666    <DefineConstants>TRACE</DefineConstants>
    6767    <Optimize>true</Optimize>
    … …  
    7373  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7474    <DebugSymbols>true</DebugSymbols>
    75     <OutputPath>bin\x86\Debug\</OutputPath>
     75    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7676    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7777    <DebugType>full</DebugType>
    … …  
    8181  </PropertyGroup>
    8282  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    83     <OutputPath>bin\x86\Release\</OutputPath>
     83    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8484    <DefineConstants>TRACE</DefineConstants>
    8585    <Optimize>true</Optimize>
    … …  
    104104      <Project>{EBEBA863-DD05-4331-BE25-5758B15F7407}</Project>
    105105      <Name>HeuristicLab.Services.Deployment.DataAccess-3.3</Name>
    106     </ProjectReference>
     106  <Private>False</Private></ProjectReference>
    107107    <ProjectReference Include="..\HeuristicLab.Services.Deployment-3.3.csproj">
    108108      <Project>{30D8C5F1-CD3A-4EC1-907F-430177A03FBE}</Project>
    109109      <Name>HeuristicLab.Services.Deployment-3.3</Name>
    110     </ProjectReference>
     110  <Private>False</Private></ProjectReference>
    111111  </ItemGroup>
    112112  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.