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

    • Property svn:ignore

      •  

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

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

    r5163 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.Collections-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.Collections-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.Collections-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    110113  </ItemGroup>
    111114  <ItemGroup>
    112     <None Include="HeuristicLabCollectionsPlugin.cs.frame" />
     115    <None Include="Plugin.cs.frame" />
    113116    <Compile Include="INotifyObservableListItemsChanged.cs" />
    114117    <Compile Include="INotifyObservableKeyedCollectionItemsChanged.cs" />
    … …  
    116119    <Compile Include="INotifyObservableCollectionItemsChanged.cs" />
    117120    <Compile Include="INotifyObservableArrayItemsChanged.cs" />
     121    <Compile Include="Plugin.cs" />
    118122    <Compile Include="ReadOnlyObservableArray.cs" />
    119123    <Compile Include="ObservableArray.cs" />
    … …  
    140144    <Compile Include="CollectionItemsChangedEventArgs.cs" />
    141145    <Compile Include="CollectionItemsChangedEventHandler.cs" />
    142     <Compile Include="HeuristicLabCollectionsPlugin.cs" />
    143146    <Compile Include="ObservableDictionary.cs" />
    144147    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    146149  <ItemGroup>
    147150    <None Include="HeuristicLab.snk" />
    148     <None Include="Properties\AssemblyInfo.frame" />
     151    <None Include="Properties\AssemblyInfo.cs.frame" />
    149152  </ItemGroup>
    150153  <ItemGroup>
    … …  
    152155      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    153156      <Name>HeuristicLab.Persistence-3.3</Name>
     157      <Private>False</Private>
    154158    </ProjectReference>
    155159    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    156160      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    157161      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     162      <Private>False</Private>
    158163    </ProjectReference>
    159164  </ItemGroup>
    … …  
    190195
    191196call PreBuildEvent.cmd
    192 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabCollectionsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabCollectionsPlugin.cs"</PreBuildEvent>
     197</PreBuildEvent>
    193198  </PropertyGroup>
    194199</Project>
Note: See TracChangeset for help on using the changeset viewer.