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:
1 deleted
3 edited
1 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.QuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.csproj

    r6628 r6866  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>bin\Debug\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>bin\Release\</OutputPath>
     28    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
    … …  
    3939  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4040    <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>bin\x86\Debug\</OutputPath>
     41    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4242    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4343    <DebugType>full</DebugType>
    … …  
    5454  </PropertyGroup>
    5555  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    56     <OutputPath>bin\x86\Release\</OutputPath>
     56    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5757    <DefineConstants>TRACE</DefineConstants>
    5858    <Optimize>true</Optimize>
    5959    <DebugType>pdbonly</DebugType>
    6060    <PlatformTarget>x86</PlatformTarget>
    61     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     61    <CodeAnalysisLogFile>$(SolutionDir)\bin\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6262    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6363    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7070  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7171    <DebugSymbols>true</DebugSymbols>
    72     <OutputPath>bin\x64\Debug\</OutputPath>
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7373    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7474    <DebugType>full</DebugType>
    … …  
    8585  </PropertyGroup>
    8686  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    87     <OutputPath>bin\x64\Release\</OutputPath>
     87    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8888    <DefineConstants>TRACE</DefineConstants>
    8989    <Optimize>true</Optimize>
    9090    <DebugType>pdbonly</DebugType>
    9191    <PlatformTarget>x64</PlatformTarget>
    92     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     92    <CodeAnalysisLogFile>$(SolutionDir)\bin\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9393    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9494    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    112112    <Compile Include="Plugin.cs" />
    113113    <Compile Include="Properties\AssemblyInfo.cs" />
    114     <None Include="Properties\AssemblyInfo.frame" />
     114    <None Include="Properties\AssemblyInfo.cs.frame" />
    115115  </ItemGroup>
    116116  <ItemGroup>
    … …  
    121121      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    122122      <Name>HeuristicLab.Analysis-3.3</Name>
     123      <Private>False</Private>
    123124    </ProjectReference>
    124125    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    125126      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    126127      <Name>HeuristicLab.Collections-3.3</Name>
    127     </ProjectReference>
    128     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    129       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    130       <Name>HeuristicLab.Common.Resources-3.3</Name>
     128      <Private>False</Private>
    131129    </ProjectReference>
    132130    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    133131      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    134132      <Name>HeuristicLab.Common-3.3</Name>
     133      <Private>False</Private>
    135134    </ProjectReference>
    136135    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    137136      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    138137      <Name>HeuristicLab.Core-3.3</Name>
     138      <Private>False</Private>
    139139    </ProjectReference>
    140140    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    141141      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    142142      <Name>HeuristicLab.Data-3.3</Name>
     143      <Private>False</Private>
    143144    </ProjectReference>
    144145    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    145146      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    146147      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     148      <Private>False</Private>
    147149    </ProjectReference>
    148150    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    149151      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    150152      <Name>HeuristicLab.Operators-3.3</Name>
     153      <Private>False</Private>
    151154    </ProjectReference>
    152155    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    153156      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    154157      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     158      <Private>False</Private>
    155159    </ProjectReference>
    156160    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    157161      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    158162      <Name>HeuristicLab.Optimization-3.3</Name>
     163      <Private>False</Private>
    159164    </ProjectReference>
    160165    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    161166      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    162167      <Name>HeuristicLab.Parameters-3.3</Name>
     168      <Private>False</Private>
    163169    </ProjectReference>
    164170    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    165171      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    166172      <Name>HeuristicLab.Persistence-3.3</Name>
     173      <Private>False</Private>
    167174    </ProjectReference>
    168175    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    169176      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    170177      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     178      <Private>False</Private>
    171179    </ProjectReference>
    172180    <ProjectReference Include="..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
    173181      <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
    174182      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
     183      <Private>False</Private>
    175184    </ProjectReference>
    176185    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    177186      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    178187      <Name>HeuristicLab.Random-3.3</Name>
     188      <Private>False</Private>
    179189    </ProjectReference>
    180190  </ItemGroup>
    … …  
    187197
    188198call PreBuildEvent.cmd
    189 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
     199</PreBuildEvent>
    190200  </PropertyGroup>
    191201  <PropertyGroup>

  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/Plugin.cs.frame

    r6628 r6866  
    2828  [PluginDependency("HeuristicLab.Collections", "3.3")]
    2929  [PluginDependency("HeuristicLab.Common", "3.3")]
    30   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3130  [PluginDependency("HeuristicLab.Core", "3.3")]
    3231  [PluginDependency("HeuristicLab.Data", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.