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.Operators.Views.GraphVisualization.Views/3.3/HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.csproj

    r6036 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>
    … …  
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="HeuristicLab.Netron-3.0.2672.12446, Version=3.0.2672.12446, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     105      <HintPath>..\..\bin\HeuristicLab.Netron-3.0.2672.12446.dll</HintPath>
     106    </Reference>
     107    <Reference Include="Netron.Diagramming.Core-3.0.2672.12446, Version=3.0.2672.12446, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <HintPath>..\..\bin\Netron.Diagramming.Core-3.0.2672.12446.dll</HintPath>
     109    </Reference>
    104110    <Reference Include="System" />
    105111    <Reference Include="System.Core" />
    … …  
    129135    <Compile Include="Plugin.cs" />
    130136    <Compile Include="Properties\AssemblyInfo.cs" />
    131     <None Include="Properties\AssemblyInfo.frame" />
     137    <None Include="Properties\AssemblyInfo.cs.frame" />
    132138  </ItemGroup>
    133139  <ItemGroup>
    … …  
    138144      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    139145      <Name>HeuristicLab.Collections-3.3</Name>
     146      <Private>False</Private>
    140147    </ProjectReference>
    141148    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    142149      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    143150      <Name>HeuristicLab.Common.Resources-3.3</Name>
     151      <Private>False</Private>
    144152    </ProjectReference>
    145153    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    146154      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    147155      <Name>HeuristicLab.Common-3.3</Name>
     156      <Private>False</Private>
    148157    </ProjectReference>
    149158    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    150159      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    151160      <Name>HeuristicLab.Core.Views-3.3</Name>
     161      <Private>False</Private>
    152162    </ProjectReference>
    153163    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    154164      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    155165      <Name>HeuristicLab.Core-3.3</Name>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.Netron\3.0.2672.12446\HeuristicLab.Netron-3.0.2672.12446\HeuristicLab.Netron-3.0.2672.12446.csproj">
    158       <Project>{BB994448-2B21-4564-BB2E-38D8FFF8CF18}</Project>
    159       <Name>HeuristicLab.Netron-3.0.2672.12446 %28HeuristicLab.ExtLibs\HeuristicLab.Netron\HeuristicLab.Netron-3.0.2672.12446\HeuristicLab.Netron-3.0.2672.12446%29</Name>
    160     </ProjectReference>
    161     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.Netron\3.0.2672.12446\Netron.Diagramming.Core-3.0.2672.12446\Netron.Diagramming.Core-3.0.2672.12446.csproj">
    162       <Project>{96AEBBEE-4203-45F3-BCF5-7B73BF256BDA}</Project>
    163       <Name>Netron.Diagramming.Core-3.0.2672.12446</Name>
     166      <Private>False</Private>
    164167    </ProjectReference>
    165168    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    166169      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    167170      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     171      <Private>False</Private>
    168172    </ProjectReference>
    169173    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    170174      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    171175      <Name>HeuristicLab.MainForm-3.3</Name>
     176      <Private>False</Private>
    172177    </ProjectReference>
    173178    <ProjectReference Include="..\..\HeuristicLab.Operators.Views.GraphVisualization\3.3\HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj">
    174179      <Project>{57F38579-409D-4DD8-AB19-3F2C4A665126}</Project>
    175180      <Name>HeuristicLab.Operators.Views.GraphVisualization-3.3</Name>
     181      <Private>False</Private>
    176182    </ProjectReference>
    177183    <ProjectReference Include="..\..\HeuristicLab.Operators.Views\3.3\HeuristicLab.Operators.Views-3.3.csproj">
    178184      <Project>{C49CB749-8B24-4628-8003-E86475749410}</Project>
    179185      <Name>HeuristicLab.Operators.Views-3.3</Name>
     186      <Private>False</Private>
    180187    </ProjectReference>
    181188    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    182189      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    183190      <Name>HeuristicLab.Operators-3.3</Name>
     191      <Private>False</Private>
    184192    </ProjectReference>
    185193    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
    186194      <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
    187195      <Name>HeuristicLab.Optimizer-3.3</Name>
     196      <Private>False</Private>
    188197    </ProjectReference>
    189198    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    190199      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    191200      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     201      <Private>False</Private>
    192202    </ProjectReference>
    193203  </ItemGroup>
    … …  
    200210
    201211call PreBuildEvent.cmd
    202 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
     212</PreBuildEvent>
    203213  </PropertyGroup>
    204214  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.