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 deleted
4 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.Analysis

  • trunk/sources/HeuristicLab.Analysis/3.3

    • Property svn:ignore

      •  

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

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

    r6628 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>
    56     <DocumentationFile>bin\Release\HeuristicLab.Analysis-3.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x86\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    69     <OutputPath>bin\x86\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x86\Release\HeuristicLab.Analysis-3.3.XML</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7274    <Optimize>true</Optimize>
    7375    <DebugType>pdbonly</DebugType>
    … …  
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x64\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    88     <OutputPath>bin\x64\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    90     <DocumentationFile>bin\x64\Release\HeuristicLab.Analysis-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    9699  </PropertyGroup>
    97100  <ItemGroup>
     101    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
     103    </Reference>
    98104    <Reference Include="System" />
    99105    <Reference Include="System.Core">
    … …  
    111117  </ItemGroup>
    112118  <ItemGroup>
    113     <None Include="HeuristicLabAnalysisPlugin.cs.frame" />
     119    <None Include="Plugin.cs.frame" />
    114120    <Compile Include="AlleleFrequencyAnalysis\Allele.cs" />
    115121    <Compile Include="AlleleFrequencyAnalysis\AlleleFrequency.cs" />
    … …  
    129135    <Compile Include="MultiObjective\RankBasedParetoFrontAnalyzer.cs" />
    130136    <Compile Include="MultiObjective\ParetoFrontAnalyzer.cs" />
     137    <Compile Include="Plugin.cs" />
    131138    <Compile Include="PopulationDiversityAnalysis\PopulationDiversityAnalyzer.cs" />
    132139    <Compile Include="QualityAnalysis\BestAverageWorstQualityAnalyzer.cs" />
    … …  
    136143    <Compile Include="QualityAnalysis\QualityDifferenceCalculator.cs" />
    137144    <Compile Include="MultiAnalyzer.cs" />
    138     <Compile Include="HeuristicLabAnalysisPlugin.cs" />
    139145    <Compile Include="Properties\AssemblyInfo.cs" />
    140146    <Compile Include="QualityAnalysis\QualityDistributionAnalyzer.cs" />
    … …  
    146152  <ItemGroup>
    147153    <None Include="HeuristicLab.snk" />
    148     <None Include="Properties\AssemblyInfo.frame" />
     154    <None Include="Properties\AssemblyInfo.cs.frame" />
    149155  </ItemGroup>
    150156  <ItemGroup>
    … …  
    152158      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    153159      <Name>HeuristicLab.Collections-3.3</Name>
     160      <Private>False</Private>
    154161    </ProjectReference>
    155162    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    156163      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    157164      <Name>HeuristicLab.Common.Resources-3.3</Name>
     165      <Private>False</Private>
    158166    </ProjectReference>
    159167    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    160168      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    161169      <Name>HeuristicLab.Common-3.3</Name>
     170      <Private>False</Private>
    162171    </ProjectReference>
    163172    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    164173      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    165174      <Name>HeuristicLab.Core-3.3</Name>
     175      <Private>False</Private>
    166176    </ProjectReference>
    167177    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    168178      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    169179      <Name>HeuristicLab.Data-3.3</Name>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    172       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    173       <Name>ALGLIB-3.1.0</Name>
     180      <Private>False</Private>
    174181    </ProjectReference>
    175182    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    176183      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    177184      <Name>HeuristicLab.Operators-3.3</Name>
     185      <Private>False</Private>
    178186    </ProjectReference>
    179187    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    180188      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    181189      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     190      <Private>False</Private>
    182191    </ProjectReference>
    183192    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    184193      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    185194      <Name>HeuristicLab.Optimization-3.3</Name>
     195      <Private>False</Private>
    186196    </ProjectReference>
    187197    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    188198      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    189199      <Name>HeuristicLab.Parameters-3.3</Name>
     200      <Private>False</Private>
    190201    </ProjectReference>
    191202    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    192203      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    193204      <Name>HeuristicLab.Persistence-3.3</Name>
     205      <Private>False</Private>
    194206    </ProjectReference>
    195207    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    196208      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    197209      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     210      <Private>False</Private>
    198211    </ProjectReference>
    199212  </ItemGroup>
    … …  
    230243
    231244call PreBuildEvent.cmd
    232 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAnalysisPlugin.cs"</PreBuildEvent>
     245</PreBuildEvent>
    233246  </PropertyGroup>
    234247</Project>
Note: See TracChangeset for help on using the changeset viewer.