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

    • Property svn:ignore

      •  

        old new  
        44*.vs10x
        55HeuristicLab.ParallelEngine-3.3.csproj.user
         6Plugin.cs

  • trunk/sources/HeuristicLab.ParallelEngine/3.3/HeuristicLab.ParallelEngine-3.3.csproj

    r5193 r6866  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    … …  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>bin\Debug\</OutputPath>
     22    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
    … …  
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>bin\Release\</OutputPath>
     30    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
    … …  
    4141  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4242    <DebugSymbols>true</DebugSymbols>
    43     <OutputPath>bin\x64\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <DebugType>full</DebugType>
    … …  
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    58     <OutputPath>bin\x64\Release\</OutputPath>
     58    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5959    <DefineConstants>TRACE</DefineConstants>
    6060    <Optimize>true</Optimize>
    6161    <DebugType>pdbonly</DebugType>
    6262    <PlatformTarget>x64</PlatformTarget>
    63     <CodeAnalysisLogFile>bin\Release\HeuristicLab.ParallelEngine-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     63    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.ParallelEngine-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6464    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6565    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    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>
    … …  
    8888  </PropertyGroup>
    8989  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    90     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <Optimize>true</Optimize>
    9393    <DebugType>pdbonly</DebugType>
    9494    <PlatformTarget>x86</PlatformTarget>
    95     <CodeAnalysisLogFile>bin\Release\HeuristicLab.ParallelEngine-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     95    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.ParallelEngine-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9696    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9797    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    112112  </ItemGroup>
    113113  <ItemGroup>
    114     <Compile Include="HeuristicLabParallelEnginePlugin.cs" />
     114    <Compile Include="Plugin.cs" />
    115115    <Compile Include="Properties\AssemblyInfo.cs" />
    116116    <Compile Include="ParallelEngine.cs" />
    … …  
    118118  <ItemGroup>
    119119    <None Include="HeuristicLab.snk" />
    120     <None Include="HeuristicLabParallelEnginePlugin.cs.frame" />
    121     <None Include="Properties\AssemblyInfo.frame" />
     120    <None Include="Plugin.cs.frame" />
     121    <None Include="Properties\AssemblyInfo.cs.frame" />
    122122  </ItemGroup>
    123123  <ItemGroup>
    … …  
    125125      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    126126      <Name>HeuristicLab.Common-3.3</Name>
     127      <Private>False</Private>
    127128    </ProjectReference>
    128129    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    129130      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    130131      <Name>HeuristicLab.Core-3.3</Name>
     132      <Private>False</Private>
    131133    </ProjectReference>
    132134    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    133135      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    134136      <Name>HeuristicLab.Persistence-3.3</Name>
     137      <Private>False</Private>
    135138    </ProjectReference>
    136139    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    137140      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    138141      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     142      <Private>False</Private>
    139143    </ProjectReference>
    140144  </ItemGroup>
    … …  
    147151
    148152call PreBuildEvent.cmd
    149 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabParallelEnginePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabParallelEnginePlugin.cs"</PreBuildEvent>
     153</PreBuildEvent>
    150154  </PropertyGroup>
    151155  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.