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

    • Property svn:ignore

      •  

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

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

    r5163 r6866  
    4040    <DebugType>full</DebugType>
    4141    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     42    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4343    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4444    <ErrorReport>prompt</ErrorReport>
    … …  
    4949    <DebugType>pdbonly</DebugType>
    5050    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     51    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5252    <DefineConstants>TRACE</DefineConstants>
    5353    <ErrorReport>prompt</ErrorReport>
    … …  
    5757  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5858    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x86\Debug\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6161    <DebugType>full</DebugType>
    … …  
    6565  </PropertyGroup>
    6666  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    67     <OutputPath>bin\x86\Release\</OutputPath>
     67    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6868    <DefineConstants>TRACE</DefineConstants>
    6969    <Optimize>true</Optimize>
    … …  
    7575  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7676    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x64\Debug\</OutputPath>
     77    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7878    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7979    <DebugType>full</DebugType>
    … …  
    8383  </PropertyGroup>
    8484  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    85     <OutputPath>bin\x64\Release\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8686    <DefineConstants>TRACE</DefineConstants>
    8787    <Optimize>true</Optimize>
    … …  
    9595      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    9696      <Name>HeuristicLab.Analysis-3.3</Name>
     97      <Private>False</Private>
    9798    </ProjectReference>
    9899    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    99100      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    100101      <Name>HeuristicLab.Collections-3.3</Name>
     102      <Private>False</Private>
    101103    </ProjectReference>
    102104    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    103105      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    104106      <Name>HeuristicLab.Common-3.3</Name>
     107      <Private>False</Private>
    105108    </ProjectReference>
    106109    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    107110      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    108111      <Name>HeuristicLab.Core-3.3</Name>
     112      <Private>False</Private>
    109113    </ProjectReference>
    110114    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    111115      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    112116      <Name>HeuristicLab.Data-3.3</Name>
     117      <Private>False</Private>
    113118    </ProjectReference>
    114119    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    115120      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    116121      <Name>HeuristicLab.Operators-3.3</Name>
     122      <Private>False</Private>
    117123    </ProjectReference>
    118124    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    119125      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    120126      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     127      <Private>False</Private>
    121128    </ProjectReference>
    122129    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    123130      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    124131      <Name>HeuristicLab.Optimization-3.3</Name>
     132      <Private>False</Private>
    125133    </ProjectReference>
    126134    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    127135      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    128136      <Name>HeuristicLab.Parameters-3.3</Name>
     137      <Private>False</Private>
    129138    </ProjectReference>
    130139    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    131140      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    132141      <Name>HeuristicLab.Persistence-3.3</Name>
     142      <Private>False</Private>
    133143    </ProjectReference>
    134144    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    135145      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    136146      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     147      <Private>False</Private>
    137148    </ProjectReference>
    138149    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    139150      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    140151      <Name>HeuristicLab.Random-3.3</Name>
     152      <Private>False</Private>
    141153    </ProjectReference>
    142154    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    143155      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    144156      <Name>HeuristicLab.Selection-3.3</Name>
     157      <Private>False</Private>
    145158    </ProjectReference>
    146159    <Reference Include="System" />
    … …  
    153166  <ItemGroup>
    154167    <None Include="HeuristicLab.snk" />
    155     <None Include="HeuristicLabAlgorithmsNSGA2Plugin.cs.frame" />
    156     <Compile Include="HeuristicLabAlgorithmsNSGA2Plugin.cs" />
     168    <None Include="Plugin.cs.frame" />
    157169    <Compile Include="NSGA2.cs" />
    158170    <Compile Include="NSGA2MainLoop.cs" />
     171    <Compile Include="Plugin.cs" />
    159172    <Compile Include="Properties\AssemblyInfo.cs" />
    160     <None Include="Properties\AssemblyInfo.frame" />
     173    <None Include="Properties\AssemblyInfo.cs.frame" />
    161174  </ItemGroup>
    162175  <ItemGroup>
    … …  
    192205
    193206call PreBuildEvent.cmd
    194 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsNSGA2Plugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsNSGA2Plugin.cs"</PreBuildEvent>
     207</PreBuildEvent>
    195208  </PropertyGroup>
    196209  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.