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

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
2 deleted
3 edited
2 copied

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.Tracing/3.3

    • Property svn:ignore
      •  

        old new  
        44HeuristicLabTracingPlugin.cs
        55*.vs10x
         6Plugin.cs
  • trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj

    r6179 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>
    5555    <WarningLevel>4</WarningLevel>
    56     <DocumentationFile>bin\Release\HeuristicLab.Tracing-3.3.xml</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x64\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
     
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>bin\x64\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    7172    <Optimize>true</Optimize>
     
    7374    <PlatformTarget>x64</PlatformTarget>
    7475    <ErrorReport>prompt</ErrorReport>
    75     <DocumentationFile>bin\x64\Release\HeuristicLab.Tracing-3.3.xml</DocumentationFile>
     76    <DocumentationFile>
     77    </DocumentationFile>
    7678    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    7779  </PropertyGroup>
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x86\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
     
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    88     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    9092    <Optimize>true</Optimize>
     
    9294    <PlatformTarget>x86</PlatformTarget>
    9395    <ErrorReport>prompt</ErrorReport>
    94     <DocumentationFile>bin\x86\Release\HeuristicLab.Tracing-3.3.xml</DocumentationFile>
     96    <DocumentationFile>
     97    </DocumentationFile>
    9598    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    9699  </PropertyGroup>
     
    110113  </ItemGroup>
    111114  <ItemGroup>
    112     <None Include="HeuristicLabTracingPlugin.cs.frame" />
    113     <Compile Include="HeuristicLabTracingPlugin.cs" />
     115    <None Include="Plugin.cs.frame" />
    114116    <Compile Include="Logger.cs" />
     117    <Compile Include="Plugin.cs" />
    115118    <Compile Include="Properties\AssemblyInfo.cs" />
    116119  </ItemGroup>
     
    119122      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    120123      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     124      <Private>False</Private>
    121125    </ProjectReference>
    122126  </ItemGroup>
    123127  <ItemGroup>
    124     <None Include="app.config" />
     128    <None Include="app.config">
     129      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     130    </None>
    125131    <None Include="HeuristicLab.snk" />
    126     <None Include="Properties\AssemblyInfo.frame" />
     132    <None Include="Properties\AssemblyInfo.cs.frame" />
    127133  </ItemGroup>
    128134  <ItemGroup>
     
    158164
    159165call PreBuildEvent.cmd
    160 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabTracingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabTracingPlugin.cs"</PreBuildEvent>
     166</PreBuildEvent>
    161167  </PropertyGroup>
    162168</Project>
Note: See TracChangeset for help on using the changeset viewer.