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.Problems.Knapsack/3.3

    • Property svn:ignore

      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs

  • trunk/sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.Problems.Knapsack-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    … …  
    5758  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5859    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6061    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6162    <DebugType>full</DebugType>
    … …  
    6566  </PropertyGroup>
    6667  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    67     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6869    <DefineConstants>TRACE</DefineConstants>
    6970    <Optimize>true</Optimize>
    … …  
    7576  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7677    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7879    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7980    <DebugType>full</DebugType>
    … …  
    8384  </PropertyGroup>
    8485  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    85     <OutputPath>bin\x64\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8687    <DefineConstants>TRACE</DefineConstants>
    8788    <Optimize>true</Optimize>
    … …  
    108109  <ItemGroup>
    109110    <Compile Include="Evaluators\KnapsackEvaluator.cs" />
    110     <Compile Include="HeuristicLabProblemsKnapsackPlugin.cs" />
    111111    <Compile Include="Interfaces\IKnapsackEvaluator.cs" />
    112112    <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />
    … …  
    115115    <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" />
    116116    <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" />
     117    <Compile Include="Plugin.cs" />
    117118    <Compile Include="Properties\AssemblyInfo.cs" />
    118119    <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" />
    … …  
    120121  <ItemGroup>
    121122    <None Include="HeuristicLab.snk" />
    122     <None Include="HeuristicLabProblemsKnapsackPlugin.cs.frame" />
    123     <None Include="Properties\AssemblyInfo.frame" />
     123    <None Include="Plugin.cs.frame" />
     124    <None Include="Properties\AssemblyInfo.cs.frame" />
    124125  </ItemGroup>
    125126  <ItemGroup>
    … …  
    127128      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    128129      <Name>HeuristicLab.Collections-3.3</Name>
     130      <Private>False</Private>
    129131    </ProjectReference>
    130132    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    131133      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    132134      <Name>HeuristicLab.Common.Resources-3.3</Name>
     135      <Private>False</Private>
    133136    </ProjectReference>
    134137    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    135138      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    136139      <Name>HeuristicLab.Common-3.3</Name>
     140      <Private>False</Private>
    137141    </ProjectReference>
    138142    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    139143      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    140144      <Name>HeuristicLab.Core-3.3</Name>
     145      <Private>False</Private>
    141146    </ProjectReference>
    142147    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    143148      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    144149      <Name>HeuristicLab.Data-3.3</Name>
     150      <Private>False</Private>
    145151    </ProjectReference>
    146152    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
    147153      <Project>{66D249C3-A01D-42A8-82A2-919BC8EC3D83}</Project>
    148154      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
     155      <Private>False</Private>
    149156    </ProjectReference>
    150157    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    151158      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    152159      <Name>HeuristicLab.Operators-3.3</Name>
     160      <Private>False</Private>
    153161    </ProjectReference>
    154162    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    155163      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    156164      <Name>HeuristicLab.Optimization-3.3</Name>
     165      <Private>False</Private>
    157166    </ProjectReference>
    158167    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    159168      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    160169      <Name>HeuristicLab.Parameters-3.3</Name>
     170      <Private>False</Private>
    161171    </ProjectReference>
    162172    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    163173      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    164174      <Name>HeuristicLab.Persistence-3.3</Name>
     175      <Private>False</Private>
    165176    </ProjectReference>
    166177    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    167178      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    168179      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     180      <Private>False</Private>
    169181    </ProjectReference>
    170182  </ItemGroup>
    … …  
    201213
    202214call PreBuildEvent.cmd
    203 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsKnapsackPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsKnapsackPlugin.cs"</PreBuildEvent>
     215</PreBuildEvent>
    204216  </PropertyGroup>
    205217</Project>
Note: See TracChangeset for help on using the changeset viewer.