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

    • Property svn:ignore

      •  

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

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

    r6140 r6866  
    1212    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    … …  
    5758  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5859    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6061    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6162    <DebugType>full</DebugType>
    … …  
    6566  </PropertyGroup>
    6667  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    67     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6869    <DefineConstants>TRACE</DefineConstants>
    6970    <Optimize>true</Optimize>
    … …  
    7172    <PlatformTarget>x86</PlatformTarget>
    7273    <ErrorReport>prompt</ErrorReport>
    73     <DocumentationFile>bin\x86\Release\HeuristicLab.Problems.ExternalEvaluation-3.3.XML</DocumentationFile>
     74    <DocumentationFile>
     75    </DocumentationFile>
    7476    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    7577  </PropertyGroup>
    7678  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7779    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x64\Debug\</OutputPath>
     80    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7981    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8082    <DebugType>full</DebugType>
    … …  
    8486  </PropertyGroup>
    8587  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>bin\x64\Release\</OutputPath>
     88    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8789    <DefineConstants>TRACE</DefineConstants>
    8890    <Optimize>true</Optimize>
    … …  
    9395  </PropertyGroup>
    9496  <ItemGroup>
     97    <Reference Include="Google.ProtocolBuffers-0.9.1, Version=0.9.0.0, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48, processorArchitecture=MSIL">
     98      <HintPath>..\..\bin\Google.ProtocolBuffers-0.9.1.dll</HintPath>
     99    </Reference>
    95100    <Reference Include="System" />
    96101    <Reference Include="System.Core">
    … …  
    109114  </ItemGroup>
    110115  <ItemGroup>
    111     <None Include="HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" />
     116    <None Include="Plugin.cs.frame" />
    112117    <Compile Include="Converters\BoolConverter.cs" />
    113118    <Compile Include="Converters\TimeSpanValueConverter.cs" />
    … …  
    125130    <Compile Include="ExternalEvaluationProblem.cs" />
    126131    <Compile Include="ExternalEvaluator.cs" />
    127     <Compile Include="HeuristicLabProblemsExternalEvaluationPlugin.cs" />
    128132    <Compile Include="Interfaces\IEvaluationServiceClient.cs" />
    129133    <Compile Include="Interfaces\IEvaluationChannel.cs" />
    130134    <Compile Include="Interfaces\IExternalEvaluationProblemEvaluator.cs" />
    131135    <Compile Include="Interfaces\IItemToSolutionMessageConverter.cs" />
     136    <Compile Include="Plugin.cs" />
    132137    <Compile Include="Properties\AssemblyInfo.cs" />
    133     <None Include="Properties\AssemblyInfo.frame" />
     138    <None Include="Properties\AssemblyInfo.cs.frame" />
    134139    <Compile Include="Protos\ExternalEvaluationMessages.cs" />
    135140    <Compile Include="SolutionMessageBuilder.cs" />
    … …  
    140145      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    141146      <Name>HeuristicLab.Analysis-3.3</Name>
     147      <Private>False</Private>
    142148    </ProjectReference>
    143149    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    144150      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    145151      <Name>HeuristicLab.Collections-3.3</Name>
     152      <Private>False</Private>
    146153    </ProjectReference>
    147154    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    148155      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    149156      <Name>HeuristicLab.Common.Resources-3.3</Name>
     157      <Private>False</Private>
    150158    </ProjectReference>
    151159    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    152160      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    153161      <Name>HeuristicLab.Common-3.3</Name>
     162      <Private>False</Private>
    154163    </ProjectReference>
    155164    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    156165      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    157166      <Name>HeuristicLab.Core.Views-3.3</Name>
     167      <Private>False</Private>
    158168    </ProjectReference>
    159169    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    160170      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    161171      <Name>HeuristicLab.Core-3.3</Name>
     172      <Private>False</Private>
    162173    </ProjectReference>
    163174    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    164175      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    165176      <Name>HeuristicLab.Data-3.3</Name>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1.csproj">
    168       <Project>{236459CE-80CF-4991-972F-DE74C826BCCC}</Project>
    169       <Name>HeuristicLab.ProtobufCS-0.9.1 %28HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1\HeuristicLab.ProtobufCS-0.9.1%29</Name>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\ProtobufCS\src\ProtocolBuffers\ProtocolBuffers.csproj">
    172       <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    173       <Name>ProtocolBuffers</Name>
     177      <Private>False</Private>
    174178    </ProjectReference>
    175179    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    176180      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    177181      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     182      <Private>False</Private>
    178183    </ProjectReference>
    179184    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    180185      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    181186      <Name>HeuristicLab.MainForm-3.3</Name>
     187      <Private>False</Private>
    182188    </ProjectReference>
    183189    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    184190      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    185191      <Name>HeuristicLab.Operators-3.3</Name>
     192      <Private>False</Private>
    186193    </ProjectReference>
    187194    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    188195      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    189196      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     197      <Private>False</Private>
    190198    </ProjectReference>
    191199    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    192200      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    193201      <Name>HeuristicLab.Optimization-3.3</Name>
     202      <Private>False</Private>
    194203    </ProjectReference>
    195204    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    196205      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    197206      <Name>HeuristicLab.Parameters-3.3</Name>
     207      <Private>False</Private>
    198208    </ProjectReference>
    199209    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    200210      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    201211      <Name>HeuristicLab.Persistence-3.3</Name>
     212      <Private>False</Private>
    202213    </ProjectReference>
    203214    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    204215      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    205216      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     217      <Private>False</Private>
    206218    </ProjectReference>
    207219  </ItemGroup>
    … …  
    240252set ProjectDir=$(ProjectDir)
    241253set SolutionDir=$(SolutionDir)
    242 call "$(ProjectDir)Protos\ProcessProtos.cmd"
     254call "$(ProjectDir)\Protos\ProcessProtos.cmd"
    243255
    244256call PreBuildEvent.cmd
    245 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationPlugin.cs"</PreBuildEvent>
     257</PreBuildEvent>
    246258  </PropertyGroup>
    247259</Project>
Note: See TracChangeset for help on using the changeset viewer.