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

    • Property svn:ignore

      •  

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

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

    r6342 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>
    5656    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    57     <DocumentationFile>bin\Release\HeuristicLab.Selection-3.3.xml</DocumentationFile>
     57    <DocumentationFile>
     58    </DocumentationFile>
    5859    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5960  </PropertyGroup>
    6061  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6162    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>bin\x86\Debug\</OutputPath>
     63    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6364    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6465    <DebugType>full</DebugType>
    … …  
    6869  </PropertyGroup>
    6970  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    70     <OutputPath>bin\x86\Release\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7172    <DefineConstants>TRACE</DefineConstants>
    72     <DocumentationFile>bin\x86\Release\HeuristicLab.Selection-3.3.xml</DocumentationFile>
     73    <DocumentationFile>
     74    </DocumentationFile>
    7375    <Optimize>true</Optimize>
    7476    <DebugType>pdbonly</DebugType>
    … …  
    7981  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8082    <DebugSymbols>true</DebugSymbols>
    81     <OutputPath>bin\x64\Debug\</OutputPath>
     83    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8284    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8385    <DebugType>full</DebugType>
    … …  
    8789  </PropertyGroup>
    8890  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    89     <OutputPath>bin\x64\Release\</OutputPath>
     91    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9092    <DefineConstants>TRACE</DefineConstants>
    91     <DocumentationFile>bin\x64\Release\HeuristicLab.Selection-3.3.xml</DocumentationFile>
     93    <DocumentationFile>
     94    </DocumentationFile>
    9295    <Optimize>true</Optimize>
    9396    <DebugType>pdbonly</DebugType>
    … …  
    105108  </ItemGroup>
    106109  <ItemGroup>
    107     <None Include="HeuristicLabSelectionPlugin.cs.frame" />
     110    <None Include="Plugin.cs.frame" />
    108111    <Compile Include="BestSelector.cs" />
    109112    <Compile Include="ConditionalSelector.cs" />
    … …  
    112115    <Compile Include="LeftSelector.cs" />
    113116    <Compile Include="NoSameMatesSelector.cs" />
     117    <Compile Include="Plugin.cs" />
    114118    <Compile Include="RandomReplacer.cs" />
    115119    <Compile Include="GenderSpecificSelector.cs" />
    … …  
    128132    <Compile Include="RandomSelector.cs" />
    129133    <Compile Include="StochasticSingleObjectiveSelector.cs" />
    130     <Compile Include="HeuristicLabSelectionPlugin.cs" />
    131134    <Compile Include="Properties\AssemblyInfo.cs" />
    132135    <Compile Include="Selector.cs" />
    … …  
    137140  <ItemGroup>
    138141    <None Include="HeuristicLab.snk" />
    139     <None Include="Properties\AssemblyInfo.frame" />
     142    <None Include="Properties\AssemblyInfo.cs.frame" />
    140143  </ItemGroup>
    141144  <ItemGroup>
    … …  
    143146      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    144147      <Name>HeuristicLab.Collections-3.3</Name>
     148      <Private>False</Private>
    145149    </ProjectReference>
    146150    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    147151      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    148152      <Name>HeuristicLab.Common-3.3</Name>
     153      <Private>False</Private>
    149154    </ProjectReference>
    150155    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    151156      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    152157      <Name>HeuristicLab.Core-3.3</Name>
     158      <Private>False</Private>
    153159    </ProjectReference>
    154160    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    155161      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    156162      <Name>HeuristicLab.Data-3.3</Name>
     163      <Private>False</Private>
    157164    </ProjectReference>
    158165    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    159166      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    160167      <Name>HeuristicLab.Operators-3.3</Name>
     168      <Private>False</Private>
    161169    </ProjectReference>
    162170    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    163171      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    164172      <Name>HeuristicLab.Optimization-3.3</Name>
     173      <Private>False</Private>
    165174    </ProjectReference>
    166175    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    167176      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    168177      <Name>HeuristicLab.Parameters-3.3</Name>
     178      <Private>False</Private>
    169179    </ProjectReference>
    170180    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    171181      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    172182      <Name>HeuristicLab.Persistence-3.3</Name>
     183      <Private>False</Private>
    173184    </ProjectReference>
    174185    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    175186      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    176187      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     188      <Private>False</Private>
    177189    </ProjectReference>
    178190  </ItemGroup>
    … …  
    209221
    210222call PreBuildEvent.cmd
    211 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabSelectionPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabSelectionPlugin.cs"</PreBuildEvent>
     223</PreBuildEvent>
    212224  </PropertyGroup>
    213225</Project>
Note: See TracChangeset for help on using the changeset viewer.