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

    • Property svn:ignore

      •  

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

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

    r5163 r6866  
    2121    </StartupObject>
    2222    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    23     <TargetFrameworkProfile></TargetFrameworkProfile>
     23    <TargetFrameworkProfile>
     24    </TargetFrameworkProfile>
    2425    <PublishUrl>publish\</PublishUrl>
    2526    <Install>true</Install>
    … …  
    4243    <DebugType>full</DebugType>
    4344    <Optimize>false</Optimize>
    44     <OutputPath>bin\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4546    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4647    <ErrorReport>prompt</ErrorReport>
    … …  
    5152    <DebugType>pdbonly</DebugType>
    5253    <Optimize>true</Optimize>
    53     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5455    <DefineConstants>TRACE</DefineConstants>
    5556    <ErrorReport>prompt</ErrorReport>
    5657    <WarningLevel>4</WarningLevel>
    57     <DocumentationFile>bin\Release\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5860    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5961  </PropertyGroup>
    6062  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6163    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>bin\x86\Debug\</OutputPath>
     64    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6365    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6466    <DebugType>full</DebugType>
    … …  
    6870  </PropertyGroup>
    6971  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    70     <OutputPath>bin\x86\Release\</OutputPath>
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7173    <DefineConstants>TRACE</DefineConstants>
    72     <DocumentationFile>bin\x86\Release\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.xml</DocumentationFile>
     74    <DocumentationFile>
     75    </DocumentationFile>
    7376    <Optimize>true</Optimize>
    7477    <DebugType>pdbonly</DebugType>
    … …  
    7982  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8083    <DebugSymbols>true</DebugSymbols>
    81     <OutputPath>bin\x64\Debug\</OutputPath>
     84    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8285    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8386    <DebugType>full</DebugType>
    … …  
    8790  </PropertyGroup>
    8891  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    89     <OutputPath>bin\x64\Release\</OutputPath>
     92    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9093    <DefineConstants>TRACE</DefineConstants>
    91     <DocumentationFile>bin\x64\Release\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.xml</DocumentationFile>
     94    <DocumentationFile>
     95    </DocumentationFile>
    9296    <Optimize>true</Optimize>
    9397    <DebugType>pdbonly</DebugType>
    … …  
    107111    <Compile Include="GeneticAlgorithm.cs" />
    108112    <Compile Include="GeneticAlgorithmMainLoop.cs" />
    109     <Compile Include="HeuristicLabAlgorithmsGeneticAlgorithmPlugin.cs" />
    110113    <Compile Include="IslandGeneticAlgorithm.cs" />
    111114    <Compile Include="IslandGeneticAlgorithmMainLoop.cs" />
     115    <Compile Include="Plugin.cs" />
    112116    <Compile Include="Properties\AssemblyInfo.cs" />
    113117  </ItemGroup>
    … …  
    116120      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    117121      <Name>HeuristicLab.Analysis-3.3</Name>
     122      <Private>False</Private>
    118123    </ProjectReference>
    119124    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    120125      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    121126      <Name>HeuristicLab.Collections-3.3</Name>
     127      <Private>False</Private>
    122128    </ProjectReference>
    123129    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    124130      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    125131      <Name>HeuristicLab.Common-3.3</Name>
     132      <Private>False</Private>
    126133    </ProjectReference>
    127134    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    128135      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    129136      <Name>HeuristicLab.Core-3.3</Name>
     137      <Private>False</Private>
    130138    </ProjectReference>
    131139    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    132140      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    133141      <Name>HeuristicLab.Data-3.3</Name>
     142      <Private>False</Private>
    134143    </ProjectReference>
    135144    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    136145      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    137146      <Name>HeuristicLab.Operators-3.3</Name>
     147      <Private>False</Private>
    138148    </ProjectReference>
    139149    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    140150      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    141151      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     152      <Private>False</Private>
    142153    </ProjectReference>
    143154    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    144155      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    145156      <Name>HeuristicLab.Optimization-3.3</Name>
     157      <Private>False</Private>
    146158    </ProjectReference>
    147159    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    148160      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    149161      <Name>HeuristicLab.Parameters-3.3</Name>
     162      <Private>False</Private>
    150163    </ProjectReference>
    151164    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    152165      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    153166      <Name>HeuristicLab.Persistence-3.3</Name>
     167      <Private>False</Private>
    154168    </ProjectReference>
    155169    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    156170      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    157171      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     172      <Private>False</Private>
    158173    </ProjectReference>
    159174    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    160175      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    161176      <Name>HeuristicLab.Random-3.3</Name>
     177      <Private>False</Private>
    162178    </ProjectReference>
    163179    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    164180      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    165181      <Name>HeuristicLab.Selection-3.3</Name>
     182      <Private>False</Private>
    166183    </ProjectReference>
    167184  </ItemGroup>
    168185  <ItemGroup>
    169186    <None Include="HeuristicLab.snk" />
    170     <None Include="HeuristicLabAlgorithmsGeneticAlgorithmPlugin.cs.frame" />
    171     <None Include="Properties\AssemblyInfo.frame" />
     187    <None Include="Plugin.cs.frame" />
     188    <None Include="Properties\AssemblyInfo.cs.frame" />
    172189  </ItemGroup>
    173190  <ItemGroup>
    … …  
    203220
    204221call PreBuildEvent.cmd
    205 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsGeneticAlgorithmPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsGeneticAlgorithmPlugin.cs"</PreBuildEvent>
     222</PreBuildEvent>
    206223  </PropertyGroup>
    207224</Project>
Note: See TracChangeset for help on using the changeset viewer.