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
2 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.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

    r6344 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>
    … …  
    139139    <Compile Include="Plugin.cs" />
    140140    <Compile Include="Properties\AssemblyInfo.cs" />
    141     <None Include="Properties\AssemblyInfo.frame" />
     141    <None Include="Properties\AssemblyInfo.cs.frame" />
    142142  </ItemGroup>
    143143  <ItemGroup>
    … …  
    148148      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    149149      <Name>HeuristicLab.Analysis-3.3</Name>
     150      <Private>False</Private>
    150151    </ProjectReference>
    151152    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    152153      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    153154      <Name>HeuristicLab.Common.Resources-3.3</Name>
     155      <Private>False</Private>
    154156    </ProjectReference>
    155157    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    156158      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    157159      <Name>HeuristicLab.Common-3.3</Name>
     160      <Private>False</Private>
    158161    </ProjectReference>
    159162    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    160163      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    161164      <Name>HeuristicLab.Core.Views-3.3</Name>
     165      <Private>False</Private>
    162166    </ProjectReference>
    163167    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    164168      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    165169      <Name>HeuristicLab.Core-3.3</Name>
     170      <Private>False</Private>
    166171    </ProjectReference>
    167172    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    168173      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    169174      <Name>HeuristicLab.Data-3.3</Name>
     175      <Private>False</Private>
    170176    </ProjectReference>
    171177    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    172178      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    173179      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     180      <Private>False</Private>
    174181    </ProjectReference>
    175182    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    176183      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    177184      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     185      <Private>False</Private>
    178186    </ProjectReference>
    179187    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    180188      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    181189      <Name>HeuristicLab.MainForm-3.3</Name>
     190      <Private>False</Private>
    182191    </ProjectReference>
    183192    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    184193      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    185194      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     195      <Private>False</Private>
    186196    </ProjectReference>
    187197    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    188198      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    189199      <Name>HeuristicLab.Optimization-3.3</Name>
     200      <Private>False</Private>
    190201    </ProjectReference>
    191202    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    192203      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    193204      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     205      <Private>False</Private>
    194206    </ProjectReference>
    195207    <ProjectReference Include="..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
    196208      <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
    197209      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
     210      <Private>False</Private>
    198211    </ProjectReference>
    199212  </ItemGroup>
    … …  
    207220call PreBuildEvent.cmd
    208221SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"
    209 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Properties\AssemblyInfo.frame" "%25ProjectDir%25\Properties\AssemblyInfo.cs"</PreBuildEvent>
     222</PreBuildEvent>
    210223  </PropertyGroup>
    211224  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.