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

    • Property svn:ignore

      •  

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

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

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.Algorithms.EvolutionStrategy-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>
    … …  
    106107  </ItemGroup>
    107108  <ItemGroup>
    108     <Compile Include="HeuristicLabAlgorithmsEvolutionStrategyPlugin.cs" />
     109    <Compile Include="Plugin.cs" />
    109110    <Compile Include="Properties\AssemblyInfo.cs" />
    110111    <Compile Include="EvolutionStrategy.cs" />
    … …  
    114115  <ItemGroup>
    115116    <None Include="HeuristicLab.snk" />
    116     <None Include="HeuristicLabAlgorithmsEvolutionStrategyPlugin.cs.frame" />
    117     <None Include="Properties\AssemblyInfo.frame" />
     117    <None Include="Plugin.cs.frame" />
     118    <None Include="Properties\AssemblyInfo.cs.frame" />
    118119  </ItemGroup>
    119120  <ItemGroup>
    … …  
    121122      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    122123      <Name>HeuristicLab.Analysis-3.3</Name>
     124      <Private>False</Private>
    123125    </ProjectReference>
    124126    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    125127      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    126128      <Name>HeuristicLab.Collections-3.3</Name>
     129      <Private>False</Private>
    127130    </ProjectReference>
    128131    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    129132      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    130133      <Name>HeuristicLab.Common-3.3</Name>
     134      <Private>False</Private>
    131135    </ProjectReference>
    132136    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    133137      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    134138      <Name>HeuristicLab.Core-3.3</Name>
     139      <Private>False</Private>
    135140    </ProjectReference>
    136141    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    137142      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    138143      <Name>HeuristicLab.Data-3.3</Name>
     144      <Private>False</Private>
    139145    </ProjectReference>
    140146    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    141147      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    142148      <Name>HeuristicLab.Operators-3.3</Name>
     149      <Private>False</Private>
    143150    </ProjectReference>
    144151    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    145152      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    146153      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     154      <Private>False</Private>
    147155    </ProjectReference>
    148156    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    149157      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    150158      <Name>HeuristicLab.Optimization-3.3</Name>
     159      <Private>False</Private>
    151160    </ProjectReference>
    152161    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    153162      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    154163      <Name>HeuristicLab.Parameters-3.3</Name>
     164      <Private>False</Private>
    155165    </ProjectReference>
    156166    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    157167      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    158168      <Name>HeuristicLab.Persistence-3.3</Name>
     169      <Private>False</Private>
    159170    </ProjectReference>
    160171    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    161172      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    162173      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     174      <Private>False</Private>
    163175    </ProjectReference>
    164176    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    165177      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    166178      <Name>HeuristicLab.Random-3.3</Name>
     179      <Private>False</Private>
    167180    </ProjectReference>
    168181    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    169182      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    170183      <Name>HeuristicLab.Selection-3.3</Name>
     184      <Private>False</Private>
    171185    </ProjectReference>
    172186  </ItemGroup>
    … …  
    203217
    204218call PreBuildEvent.cmd
    205 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsEvolutionStrategyPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsEvolutionStrategyPlugin.cs"</PreBuildEvent>
     219</PreBuildEvent>
    206220  </PropertyGroup>
    207221</Project>
Note: See TracChangeset for help on using the changeset viewer.