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

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj

    r6519 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>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    9090    <PlatformTarget>x86</PlatformTarget>
    9191    <ErrorReport>prompt</ErrorReport>
    92     <DocumentationFile>bin\x86\Release\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9394    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    9495  </PropertyGroup>
    … …  
    114115  </ItemGroup>
    115116  <ItemGroup>
    116     <None Include="HeuristicLabProblemsExternalEvaluationViewsPlugin.cs.frame" />
     117    <None Include="Plugin.cs.frame" />
    117118    <Compile Include="EvaluationCacheView.cs">
    118119      <SubType>UserControl</SubType>
    … …  
    139140      <DependentUpon>EvaluationTCPChannelView.cs</DependentUpon>
    140141    </Compile>
    141     <Compile Include="HeuristicLabProblemsExternalEvaluationViewsPlugin.cs" />
     142    <Compile Include="Plugin.cs" />
    142143    <Compile Include="Properties\AssemblyInfo.cs" />
    143     <None Include="Properties\AssemblyInfo.frame" />
     144    <None Include="Properties\AssemblyInfo.cs.frame" />
    144145    <Compile Include="SolutionMessageBuilderView.cs">
    145146      <SubType>UserControl</SubType>
    … …  
    153154      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    154155      <Name>HeuristicLab.Collections-3.3</Name>
     156      <Private>False</Private>
    155157    </ProjectReference>
    156158    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    157159      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    158160      <Name>HeuristicLab.Common.Resources-3.3</Name>
     161      <Private>False</Private>
    159162    </ProjectReference>
    160163    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    161164      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    162165      <Name>HeuristicLab.Common-3.3</Name>
     166      <Private>False</Private>
    163167    </ProjectReference>
    164168    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    165169      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    166170      <Name>HeuristicLab.Core.Views-3.3</Name>
     171      <Private>False</Private>
    167172    </ProjectReference>
    168173    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    169174      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    170175      <Name>HeuristicLab.Core-3.3</Name>
     176      <Private>False</Private>
    171177    </ProjectReference>
    172178    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    173179      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    174180      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     181      <Private>False</Private>
    175182    </ProjectReference>
    176183    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    177184      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    178185      <Name>HeuristicLab.MainForm-3.3</Name>
     186      <Private>False</Private>
    179187    </ProjectReference>
    180188    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    181189      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    182190      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     191      <Private>False</Private>
    183192    </ProjectReference>
    184193    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    185194      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    186195      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     196      <Private>False</Private>
    187197    </ProjectReference>
    188198    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation\3.3\HeuristicLab.Problems.ExternalEvaluation-3.3.csproj">
    189199      <Project>{25735DB4-8E54-4A2C-83E3-A60C76565E55}</Project>
    190200      <Name>HeuristicLab.Problems.ExternalEvaluation-3.3</Name>
     201      <Private>False</Private>
    191202    </ProjectReference>
    192203  </ItemGroup>
    … …  
    219230
    220231call PreBuildEvent.cmd
    221 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationViewsPlugin.cs"</PreBuildEvent>
     232</PreBuildEvent>
    222233  </PropertyGroup>
    223234  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.