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.Persistence

  • trunk/sources/HeuristicLab.Persistence/3.3

    • Property svn:ignore

      •  

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

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

    r6342 r6866  
    4343    <DebugType>full</DebugType>
    4444    <Optimize>false</Optimize>
    45     <OutputPath>bin\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4646    <DefineConstants>TRACE;DEBUG</DefineConstants>
    4747    <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.Persistence-3.3.XML</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5960    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    6061    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    6263  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6364    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>bin\x64\Debug\</OutputPath>
     65    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6566    <DefineConstants>TRACE;DEBUG</DefineConstants>
    6667    <DebugType>full</DebugType>
    … …  
    7071  </PropertyGroup>
    7172  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    72     <OutputPath>bin\x64\Release\</OutputPath>
     73    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7374    <DefineConstants>TRACE</DefineConstants>
    7475    <Optimize>true</Optimize>
    … …  
    7677    <PlatformTarget>x64</PlatformTarget>
    7778    <ErrorReport>prompt</ErrorReport>
    78     <DocumentationFile>bin\x64\Release\HeuristicLab.Persistence-3.3.XML</DocumentationFile>
     79    <DocumentationFile>
     80    </DocumentationFile>
    7981    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    8082  </PropertyGroup>
    8183  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    8284    <DebugSymbols>true</DebugSymbols>
    83     <OutputPath>bin\x86\Debug\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8486    <DefineConstants>TRACE;DEBUG</DefineConstants>
    8587    <DebugType>full</DebugType>
    … …  
    8991  </PropertyGroup>
    9092  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    91     <OutputPath>bin\x86\Release\</OutputPath>
     93    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9294    <DefineConstants>TRACE</DefineConstants>
    9395    <Optimize>true</Optimize>
    … …  
    9597    <PlatformTarget>x86</PlatformTarget>
    9698    <ErrorReport>prompt</ErrorReport>
    97     <DocumentationFile>bin\x86\Release\HeuristicLab.Persistence-3.3.XML</DocumentationFile>
     99    <DocumentationFile>
     100    </DocumentationFile>
    98101    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    99102  </PropertyGroup>
    … …  
    125128    <Compile Include="Auxiliary\TypeNameParser.cs" />
    126129    <Compile Include="Auxiliary\ReflectionTools.cs" />
    127     <None Include="HeuristicLabPersistencePlugin.cs.frame" />
     130    <None Include="Plugin.cs.frame" />
    128131    <Compile Include="Core\Configuration.cs" />
    129132    <Compile Include="Core\PersistenceException.cs" />
    … …  
    213216    <Compile Include="Default\Xml\XmlString.cs" />
    214217    <Compile Include="Default\Xml\XmlFormat.cs" />
    215     <Compile Include="HeuristicLabPersistencePlugin.cs" />
    216218    <Compile Include="Core\Deserializer.cs" />
    217219    <Compile Include="Core\Tag.cs" />
    … …  
    231233    <Compile Include="Core\Tokens\ReferenceToken.cs" />
    232234    <Compile Include="Core\Tokens\NullReferenceToken.cs" />
     235    <Compile Include="Plugin.cs" />
    233236    <Compile Include="Properties\AssemblyInfo.cs" />
    234237    <Compile Include="Core\Serializer.cs" />
    … …  
    248251
    249252call PreBuildEvent.cmd
    250 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabPersistencePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabPersistencePlugin.cs"</PreBuildEvent>
     253</PreBuildEvent>
    251254    <PostBuildEvent>
    252255    </PostBuildEvent>
    … …  
    255258    <None Include="app.config" />
    256259    <None Include="HeuristicLab.snk" />
    257     <None Include="Properties\AssemblyInfo.frame" />
     260    <None Include="Properties\AssemblyInfo.cs.frame" />
    258261    <None Include="Properties\Settings.settings">
    259262      <Generator>SettingsSingleFileGenerator</Generator>
    … …  
    265268      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    266269      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     270      <Private>False</Private>
    267271    </ProjectReference>
    268272    <ProjectReference Include="..\..\HeuristicLab.Tracing\3.3\HeuristicLab.Tracing-3.3.csproj">
    269273      <Project>{EE2034D9-6E27-48A1-B855-42D45F69A4FC}</Project>
    270274      <Name>HeuristicLab.Tracing-3.3</Name>
     275      <Private>False</Private>
    271276    </ProjectReference>
    272277  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.