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.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

    r6648 r6866  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>bin\Debug\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>bin\Release\</OutputPath>
     28    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
    … …  
    3939  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4040    <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>bin\x86\Debug\</OutputPath>
     41    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4242    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4343    <DebugType>full</DebugType>
    … …  
    5454  </PropertyGroup>
    5555  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    56     <OutputPath>bin\x86\Release\</OutputPath>
     56    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5757    <DefineConstants>TRACE</DefineConstants>
    5858    <Optimize>true</Optimize>
    5959    <DebugType>pdbonly</DebugType>
    6060    <PlatformTarget>x86</PlatformTarget>
    61     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     61    <CodeAnalysisLogFile>$(SolutionDir)\bin\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6262    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6363    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7070  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7171    <DebugSymbols>true</DebugSymbols>
    72     <OutputPath>bin\x64\Debug\</OutputPath>
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7373    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7474    <DebugType>full</DebugType>
    … …  
    8585  </PropertyGroup>
    8686  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    87     <OutputPath>bin\x64\Release\</OutputPath>
     87    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8888    <DefineConstants>TRACE</DefineConstants>
    8989    <Optimize>true</Optimize>
    9090    <DebugType>pdbonly</DebugType>
    9191    <PlatformTarget>x64</PlatformTarget>
    92     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     92    <CodeAnalysisLogFile>$(SolutionDir)\bin\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9393    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9494    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    267267    <Compile Include="Plugin.cs" />
    268268    <Compile Include="Properties\AssemblyInfo.cs" />
    269     <None Include="Properties\AssemblyInfo.frame" />
     269    <None Include="Properties\AssemblyInfo.cs.frame" />
    270270  </ItemGroup>
    271271  <ItemGroup>
    … …  
    394394      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    395395      <Name>HeuristicLab.Analysis-3.3</Name>
     396      <Private>False</Private>
    396397    </ProjectReference>
    397398    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    398399      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    399400      <Name>HeuristicLab.Collections-3.3</Name>
     401      <Private>False</Private>
    400402    </ProjectReference>
    401403    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    402404      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    403405      <Name>HeuristicLab.Common.Resources-3.3</Name>
     406      <Private>False</Private>
    404407    </ProjectReference>
    405408    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    406409      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    407410      <Name>HeuristicLab.Common-3.3</Name>
     411      <Private>False</Private>
    408412    </ProjectReference>
    409413    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    410414      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    411415      <Name>HeuristicLab.Core-3.3</Name>
     416      <Private>False</Private>
    412417    </ProjectReference>
    413418    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    414419      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    415420      <Name>HeuristicLab.Data-3.3</Name>
     421      <Private>False</Private>
    416422    </ProjectReference>
    417423    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    418424      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    419425      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     426      <Private>False</Private>
    420427    </ProjectReference>
    421428    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    422429      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    423430      <Name>HeuristicLab.Operators-3.3</Name>
     431      <Private>False</Private>
    424432    </ProjectReference>
    425433    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    426434      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    427435      <Name>HeuristicLab.Optimization-3.3</Name>
     436      <Private>False</Private>
    428437    </ProjectReference>
    429438    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    430439      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    431440      <Name>HeuristicLab.Parameters-3.3</Name>
     441      <Private>False</Private>
    432442    </ProjectReference>
    433443    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    434444      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    435445      <Name>HeuristicLab.Persistence-3.3</Name>
     446      <Private>False</Private>
    436447    </ProjectReference>
    437448    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    438449      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    439450      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     451      <Private>False</Private>
    440452    </ProjectReference>
    441453  </ItemGroup>
    … …  
    458470set Outdir=$(Outdir)
    459471
    460 call PreBuildEvent.cmd
    461 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"
    462 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Properties\AssemblyInfo.frame" "%25ProjectDir%25\Properties\AssemblyInfo.cs"</PreBuildEvent>
     472call PreBuildEvent.cmd</PreBuildEvent>
    463473  </PropertyGroup>
    464474  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.