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 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.ExtLibs/HeuristicLab.SharpDevelop/3.1.1.5327/HeuristicLab.SharpDevelop-3.1.1.5327.csproj

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.SharpDevelop-3.1.1.5327</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>
    … …  
    5051    <DebugType>pdbonly</DebugType>
    5152    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5354    <DefineConstants>TRACE</DefineConstants>
    5455    <ErrorReport>prompt</ErrorReport>
    … …  
    5859  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5960    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x86\Debug\</OutputPath>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6162    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6263    <DebugType>full</DebugType>
    … …  
    6667  </PropertyGroup>
    6768  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    68     <OutputPath>bin\x86\Release\</OutputPath>
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6970    <DefineConstants>TRACE</DefineConstants>
    7071    <Optimize>true</Optimize>
    … …  
    7677  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7778    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x64\Debug\</OutputPath>
     79    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7980    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8081    <DebugType>full</DebugType>
    … …  
    8485  </PropertyGroup>
    8586  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>bin\x64\Release\</OutputPath>
     87    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8788    <DefineConstants>TRACE</DefineConstants>
    8889    <Optimize>true</Optimize>
    … …  
    123124  </ItemGroup>
    124125  <ItemGroup>
    125     <Compile Include="HeuristicLabSharpDevelopPlugin.cs" />
     126    <Compile Include="Plugin.cs" />
    126127    <None Include="HeuristicLab.snk" />
    127     <None Include="Properties\AssemblyInfo.frame" />
     128    <None Include="Properties\AssemblyInfo.cs.frame" />
    128129    <Compile Include="Properties\AssemblyInfo.cs" />
    129130  </ItemGroup>
    … …  
    149150  </ItemGroup>
    150151  <ItemGroup>
    151     <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    152       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    153       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    154     </ProjectReference>
    155   </ItemGroup>
    156   <ItemGroup>
    157152    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    158153      <Visible>False</Visible>
    … …  
    170165      <Install>true</Install>
    171166    </BootstrapperPackage>
     167  </ItemGroup>
     168  <ItemGroup>
     169    <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     170      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     171      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     172    </ProjectReference>
    172173  </ItemGroup>
    173174  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.