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

    • Property svn:ignore

      •  

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

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

    r5809 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.Parameters-3.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x64\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>bin\x64\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x64\Release\HeuristicLab.Parameters-3.3.XML</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7274    <Optimize>true</Optimize>
    7375    <DebugType>pdbonly</DebugType>
    … …  
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x86\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    88     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    90     <DocumentationFile>bin\x86\Release\HeuristicLab.Parameters-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    111114  </ItemGroup>
    112115  <ItemGroup>
    113     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     116    <None Include="Plugin.cs.frame" />
    114117    <Compile Include="ConstrainedValueParameter.cs" />
    115118    <Compile Include="FixedValueParameter.cs" />
    116119    <Compile Include="OptionalConstrainedValueParameter.cs" />
     120    <Compile Include="Plugin.cs" />
    117121    <Compile Include="ScopeTreeLookupParameter.cs" />
    118122    <Compile Include="ValueParameter.cs" />
    … …  
    121125    <Compile Include="ValueLookupParameter.cs" />
    122126    <Compile Include="ScopeParameter.cs" />
    123     <Compile Include="HeuristicLabParametersPlugin.cs" />
    124127    <Compile Include="OperatorParameter.cs" />
    125128    <Compile Include="Parameter.cs" />
    … …  
    128131  <ItemGroup>
    129132    <None Include="HeuristicLab.snk" />
    130     <None Include="Properties\AssemblyInfo.frame" />
     133    <None Include="Properties\AssemblyInfo.cs.frame" />
    131134  </ItemGroup>
    132135  <ItemGroup>
    … …  
    134137      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    135138      <Name>HeuristicLab.Collections-3.3</Name>
     139      <Private>False</Private>
    136140    </ProjectReference>
    137141    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    138142      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    139143      <Name>HeuristicLab.Common.Resources-3.3</Name>
     144      <Private>False</Private>
    140145    </ProjectReference>
    141146    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    142147      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    143148      <Name>HeuristicLab.Common-3.3</Name>
     149      <Private>False</Private>
    144150    </ProjectReference>
    145151    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    146152      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    147153      <Name>HeuristicLab.Core-3.3</Name>
     154      <Private>False</Private>
    148155    </ProjectReference>
    149156    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    150157      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    151158      <Name>HeuristicLab.Persistence-3.3</Name>
     159      <Private>False</Private>
    152160    </ProjectReference>
    153161    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    154162      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    155163      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     164      <Private>False</Private>
    156165    </ProjectReference>
    157166  </ItemGroup>
    … …  
    188197
    189198call PreBuildEvent.cmd
    190 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabParametersPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabParametersPlugin.cs"</PreBuildEvent>
     199</PreBuildEvent>
    191200  </PropertyGroup>
    192201</Project>
Note: See TracChangeset for help on using the changeset viewer.