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

    • Property svn:ignore

      •  

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

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

    r6424 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>
    … …  
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
    5757    <WarningLevel>4</WarningLevel>
    58     <DocumentationFile>bin\Release\HeuristicLab.Core-3.3.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5960    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    6061    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    6263  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6364    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>bin\x86\Debug\</OutputPath>
     65    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6566    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6667    <DebugType>full</DebugType>
    … …  
    7071  </PropertyGroup>
    7172  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    72     <OutputPath>bin\x86\Release\</OutputPath>
     73    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7374    <DefineConstants>TRACE</DefineConstants>
    74     <DocumentationFile>bin\x86\Release\HeuristicLab.Core-3.3.xml</DocumentationFile>
     75    <DocumentationFile>
     76    </DocumentationFile>
    7577    <Optimize>true</Optimize>
    7678    <DebugType>pdbonly</DebugType>
    … …  
    8183  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8284    <DebugSymbols>true</DebugSymbols>
    83     <OutputPath>bin\x64\Debug\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8486    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8587    <DebugType>full</DebugType>
    … …  
    8991  </PropertyGroup>
    9092  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    91     <OutputPath>bin\x64\Release\</OutputPath>
     93    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9294    <DefineConstants>TRACE</DefineConstants>
    93     <DocumentationFile>bin\x64\Release\HeuristicLab.Core-3.3.xml</DocumentationFile>
     95    <DocumentationFile>
     96    </DocumentationFile>
    9497    <Optimize>true</Optimize>
    9598    <DebugType>pdbonly</DebugType>
    … …  
    110113    <Compile Include="Attributes\ItemAttribute.cs" />
    111114    <Compile Include="Attributes\CreatableAttribute.cs" />
    112     <None Include="HeuristicLabCorePlugin.cs.frame" />
     115    <None Include="Plugin.cs.frame" />
    113116    <Compile Include="Collections\CheckedItemCollection.cs" />
    114117    <Compile Include="Collections\CheckedItemList.cs" />
    … …  
    187190    <Compile Include="Interfaces\IItem.cs" />
    188191    <Compile Include="Interfaces\IRandom.cs" />
     192    <Compile Include="Plugin.cs" />
    189193    <Compile Include="Scope.cs" />
    190194    <Compile Include="Interfaces\IOperator.cs" />
    191     <Compile Include="HeuristicLabCorePlugin.cs" />
    192195    <Compile Include="Properties\AssemblyInfo.cs" />
    193196    <Compile Include="ThreadSafeLog.cs" />
    … …  
    196199  <ItemGroup>
    197200    <None Include="HeuristicLab.snk" />
    198     <None Include="Properties\AssemblyInfo.frame" />
     201    <None Include="Properties\AssemblyInfo.cs.frame" />
    199202  </ItemGroup>
    200203  <ItemGroup>
    … …  
    202205      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    203206      <Name>HeuristicLab.Collections-3.3</Name>
     207      <Private>False</Private>
    204208    </ProjectReference>
    205209    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    206210      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    207211      <Name>HeuristicLab.Common.Resources-3.3</Name>
     212      <Private>False</Private>
    208213    </ProjectReference>
    209214    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    210215      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    211216      <Name>HeuristicLab.Common-3.3</Name>
     217      <Private>False</Private>
    212218    </ProjectReference>
    213219    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    214220      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    215221      <Name>HeuristicLab.Persistence-3.3</Name>
     222      <Private>False</Private>
    216223    </ProjectReference>
    217224    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    218225      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    219226      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     227      <Private>False</Private>
    220228    </ProjectReference>
    221229  </ItemGroup>
    … …  
    262270
    263271call PreBuildEvent.cmd
    264 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabCorePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabCorePlugin.cs"</PreBuildEvent>
     272</PreBuildEvent>
    265273  </PropertyGroup>
    266274</Project>
Note: See TracChangeset for help on using the changeset viewer.