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

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.DebugEngine-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <TargetFrameworkProfile />
    … …  
    2021    <DebugType>full</DebugType>
    2122    <Optimize>false</Optimize>
    22     <OutputPath>bin\Debug\</OutputPath>
     23    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2324    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2425    <ErrorReport>prompt</ErrorReport>
    … …  
    2930    <DebugType>pdbonly</DebugType>
    3031    <Optimize>true</Optimize>
    31     <OutputPath>bin\Release\</OutputPath>
     32    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3233    <DefineConstants>TRACE</DefineConstants>
    3334    <ErrorReport>prompt</ErrorReport>
    … …  
    4243  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4344    <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>bin\x86\Debug\</OutputPath>
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4546    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4647    <DebugType>full</DebugType>
    … …  
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    60     <OutputPath>bin\x86\Release\</OutputPath>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6162    <DefineConstants>TRACE</DefineConstants>
    6263    <Optimize>true</Optimize>
    6364    <DebugType>pdbonly</DebugType>
    6465    <PlatformTarget>x86</PlatformTarget>
    65     <CodeAnalysisLogFile>bin\Release\HeuristicLab.DebugEngine.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     66    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.DebugEngine.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6667    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6768    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7576  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7677    <PlatformTarget>x64</PlatformTarget>
    77     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7879  </PropertyGroup>
    7980  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    8081    <PlatformTarget>x64</PlatformTarget>
    81     <OutputPath>bin\x64\Release\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8283  </PropertyGroup>
    8384  <ItemGroup>
    … …  
    121122      <DependentUpon>OperatorTraceView.cs</DependentUpon>
    122123    </Compile>
     124    <Compile Include="Plugin.cs" />
    123125    <Compile Include="Properties\AssemblyInfo.cs" />
    124126    <Compile Include="Utils.cs" />
    125127  </ItemGroup>
    126128  <ItemGroup>
    127     <Compile Include="HeuristicLabDebugEnginePlugin.cs" />
    128129    <None Include="HeuristicLab.snk" />
    129     <None Include="HeuristicLabDebugEnginePlugin.cs.frame" />
    130     <None Include="Properties\AssemblyInfo.frame" />
     130    <None Include="Plugin.cs.frame" />
     131    <None Include="Properties\AssemblyInfo.cs.frame" />
    131132  </ItemGroup>
    132133  <ItemGroup>
    … …  
    134135      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    135136      <Name>HeuristicLab.Collections-3.3</Name>
     137      <Private>False</Private>
    136138    </ProjectReference>
    137139    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    138140      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    139141      <Name>HeuristicLab.Common.Resources-3.3</Name>
     142      <Private>False</Private>
    140143    </ProjectReference>
    141144    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    142145      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    143146      <Name>HeuristicLab.Common-3.3</Name>
     147      <Private>False</Private>
    144148    </ProjectReference>
    145149    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    146150      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    147151      <Name>HeuristicLab.Core.Views-3.3</Name>
     152      <Private>False</Private>
    148153    </ProjectReference>
    149154    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    150155      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    151156      <Name>HeuristicLab.Core-3.3</Name>
     157      <Private>False</Private>
    152158    </ProjectReference>
    153159    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    154160      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    155161      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     162      <Private>False</Private>
    156163    </ProjectReference>
    157164    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    158165      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    159166      <Name>HeuristicLab.MainForm-3.3</Name>
     167      <Private>False</Private>
    160168    </ProjectReference>
    161169    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    162170      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    163171      <Name>HeuristicLab.Operators-3.3</Name>
     172      <Private>False</Private>
    164173    </ProjectReference>
    165174    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    166175      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    167176      <Name>HeuristicLab.Persistence-3.3</Name>
     177      <Private>False</Private>
    168178    </ProjectReference>
    169179    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    170180      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    171181      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     182      <Private>False</Private>
    172183    </ProjectReference>
    173184  </ItemGroup>
    … …  
    180191
    181192call PreBuildEvent.cmd
    182 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabDebugEnginePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabDebugEnginePlugin.cs"</PreBuildEvent>
     193</PreBuildEvent>
    183194  </PropertyGroup>
    184195  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.