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 edited

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.Optimization.Views/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r6697 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.Optimization.Views-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>
    7172    <DocumentationFile>
    … …  
    7980  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8081    <DebugSymbols>true</DebugSymbols>
    81     <OutputPath>bin\x64\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8283    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8384    <DebugType>full</DebugType>
    … …  
    8788  </PropertyGroup>
    8889  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    89     <OutputPath>bin\x64\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9091    <DefineConstants>TRACE</DefineConstants>
    91     <DocumentationFile>bin\x64\Release\HeuristicLab.Optimization.Views-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9294    <Optimize>true</Optimize>
    9395    <DebugType>pdbonly</DebugType>
    … …  
    115117  </ItemGroup>
    116118  <ItemGroup>
    117     <None Include="HeuristicLabOptimizationViewsPlugin.cs.frame" />
     119    <None Include="Plugin.cs.frame" />
    118120    <Compile Include="AlgorithmView.cs">
    119121      <SubType>UserControl</SubType>
    … …  
    128130      <DependentUpon>BatchRunView.cs</DependentUpon>
    129131    </Compile>
     132    <Compile Include="Plugin.cs" />
    130133    <Compile Include="RunCollectionModifierListView.cs">
    131134      <SubType>UserControl</SubType>
    … …  
    242245      <DependentUpon>EngineAlgorithmView.cs</DependentUpon>
    243246    </Compile>
    244     <Compile Include="HeuristicLabOptimizationViewsPlugin.cs" />
    245247    <Compile Include="ProblemView.cs">
    246248      <SubType>UserControl</SubType>
    … …  
    265267  <ItemGroup>
    266268    <None Include="HeuristicLab.snk" />
    267     <None Include="Properties\AssemblyInfo.frame" />
     269    <None Include="Properties\AssemblyInfo.cs.frame" />
    268270  </ItemGroup>
    269271  <ItemGroup>
    … …  
    271273      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    272274      <Name>HeuristicLab.Collections-3.3</Name>
     275      <Private>False</Private>
    273276    </ProjectReference>
    274277    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    275278      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    276279      <Name>HeuristicLab.Common.Resources-3.3</Name>
     280      <Private>False</Private>
    277281    </ProjectReference>
    278282    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    279283      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    280284      <Name>HeuristicLab.Common-3.3</Name>
     285      <Private>False</Private>
    281286    </ProjectReference>
    282287    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    283288      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    284289      <Name>HeuristicLab.Core.Views-3.3</Name>
     290      <Private>False</Private>
    285291    </ProjectReference>
    286292    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    287293      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    288294      <Name>HeuristicLab.Core-3.3</Name>
     295      <Private>False</Private>
    289296    </ProjectReference>
    290297    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    291298      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    292299      <Name>HeuristicLab.Data.Views-3.3</Name>
     300      <Private>False</Private>
    293301    </ProjectReference>
    294302    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    295303      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    296304      <Name>HeuristicLab.Data-3.3</Name>
     305      <Private>False</Private>
    297306    </ProjectReference>
    298307    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    299308      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    300309      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     310      <Private>False</Private>
    301311    </ProjectReference>
    302312    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    303313      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    304314      <Name>HeuristicLab.MainForm-3.3</Name>
     315      <Private>False</Private>
    305316    </ProjectReference>
    306317    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    307318      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    308319      <Name>HeuristicLab.Optimization-3.3</Name>
     320      <Private>False</Private>
    309321    </ProjectReference>
    310322    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    311323      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    312324      <Name>HeuristicLab.Persistence-3.3</Name>
     325      <Private>False</Private>
    313326    </ProjectReference>
    314327    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    315328      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    316329      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     330      <Private>False</Private>
    317331    </ProjectReference>
    318332    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    319333      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    320334      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     335      <Private>False</Private>
    321336    </ProjectReference>
    322337  </ItemGroup>
    … …  
    353368
    354369call PreBuildEvent.cmd
    355 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOptimizationViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOptimizationViewsPlugin.cs"</PreBuildEvent>
     370</PreBuildEvent>
    356371  </PropertyGroup>
    357372</Project>
Note: See TracChangeset for help on using the changeset viewer.