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.Algorithms.TabuSearch/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLab.Algorithms.TabuSearch-3.3.csproj

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.Algorithms.TabuSearch-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|x64' ">
    5859    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6061    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6162    <DebugType>full</DebugType>
    … …  
    6566  </PropertyGroup>
    6667  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    67     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6869    <DefineConstants>TRACE</DefineConstants>
    6970    <Optimize>true</Optimize>
    … …  
    7576  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7677    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7879    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7980    <DebugType>full</DebugType>
    … …  
    8384  </PropertyGroup>
    8485  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    85     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8687    <DefineConstants>TRACE</DefineConstants>
    8788    <Optimize>true</Optimize>
    … …  
    106107  </ItemGroup>
    107108  <ItemGroup>
    108     <None Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame" />
    109     <Compile Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs" />
     109    <None Include="Plugin.cs.frame" />
     110    <Compile Include="Plugin.cs" />
    110111    <Compile Include="Properties\AssemblyInfo.cs" />
    111112    <Compile Include="TabuListCreator.cs">
    … …  
    123124  <ItemGroup>
    124125    <None Include="HeuristicLab.snk" />
    125     <None Include="Properties\AssemblyInfo.frame" />
     126    <None Include="Properties\AssemblyInfo.cs.frame" />
    126127  </ItemGroup>
    127128  <ItemGroup>
    … …  
    129130      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    130131      <Name>HeuristicLab.Analysis-3.3</Name>
     132      <Private>False</Private>
    131133    </ProjectReference>
    132134    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    133135      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    134136      <Name>HeuristicLab.Collections-3.3</Name>
     137      <Private>False</Private>
    135138    </ProjectReference>
    136139    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    137140      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    138141      <Name>HeuristicLab.Common-3.3</Name>
     142      <Private>False</Private>
    139143    </ProjectReference>
    140144    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    141145      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    142146      <Name>HeuristicLab.Core-3.3</Name>
     147      <Private>False</Private>
    143148    </ProjectReference>
    144149    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    145150      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    146151      <Name>HeuristicLab.Data-3.3</Name>
     152      <Private>False</Private>
    147153    </ProjectReference>
    148154    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    149155      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    150156      <Name>HeuristicLab.Operators-3.3</Name>
     157      <Private>False</Private>
    151158    </ProjectReference>
    152159    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    153160      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    154161      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     162      <Private>False</Private>
    155163    </ProjectReference>
    156164    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    157165      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    158166      <Name>HeuristicLab.Optimization-3.3</Name>
     167      <Private>False</Private>
    159168    </ProjectReference>
    160169    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    161170      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    162171      <Name>HeuristicLab.Parameters-3.3</Name>
     172      <Private>False</Private>
    163173    </ProjectReference>
    164174    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    165175      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    166176      <Name>HeuristicLab.Persistence-3.3</Name>
     177      <Private>False</Private>
    167178    </ProjectReference>
    168179    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    169180      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    170181      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     182      <Private>False</Private>
    171183    </ProjectReference>
    172184    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    173185      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    174186      <Name>HeuristicLab.Random-3.3</Name>
     187      <Private>False</Private>
    175188    </ProjectReference>
    176189    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    177190      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    178191      <Name>HeuristicLab.Selection-3.3</Name>
     192      <Private>False</Private>
    179193    </ProjectReference>
    180194  </ItemGroup>
    … …  
    211225
    212226call PreBuildEvent.cmd
    213 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsTabuSearchPlugin.cs"</PreBuildEvent>
     227</PreBuildEvent>
    214228  </PropertyGroup>
    215229</Project>
Note: See TracChangeset for help on using the changeset viewer.