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:
2 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.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen/ProtoGen.csproj

    r6559 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    6767  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    6868    <DebugSymbols>true</DebugSymbols>
    69     <OutputPath>bin\x86\Debug\</OutputPath>
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7070    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7171    <DebugType>full</DebugType>
    … …  
    8282  </PropertyGroup>
    8383  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    84     <OutputPath>bin\x86\Release\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8585    <DefineConstants>TRACE</DefineConstants>
    8686    <Optimize>true</Optimize>
    8787    <DebugType>pdbonly</DebugType>
    8888    <PlatformTarget>x86</PlatformTarget>
    89     <CodeAnalysisLogFile>bin\Release\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     89    <CodeAnalysisLogFile>$(SolutionDir)\bin\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9090    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9191    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    115115  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    116116    <DebugSymbols>true</DebugSymbols>
    117     <OutputPath>bin\x64\Debug\</OutputPath>
     117    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    118118    <DefineConstants>DEBUG;TRACE</DefineConstants>
    119119    <DebugType>full</DebugType>
    … …  
    130130  </PropertyGroup>
    131131  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    132     <OutputPath>bin\x64\Release\</OutputPath>
     132    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    133133    <DefineConstants>TRACE</DefineConstants>
    134134    <Optimize>true</Optimize>
    135135    <DebugType>pdbonly</DebugType>
    136136    <PlatformTarget>x64</PlatformTarget>
    137     <CodeAnalysisLogFile>bin\Release\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     137    <CodeAnalysisLogFile>$(SolutionDir)\bin\ProtoGen.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    138138    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    139139    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    196196      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    197197      <Name>ProtocolBuffers</Name>
    198     </ProjectReference>
     198  <Private>False</Private></ProjectReference>
    199199  </ItemGroup>
    200200  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.