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:
3 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.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

    • Property svn:ignore

      •  

        old new  
        44*.vs10x
        55HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
         6Plugin.cs

  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj

    r6803 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    110110  </ItemGroup>
    111111  <ItemGroup>
     112    <Compile Include="Plugin.cs" />
    112113    <Compile Include="SymbolicExpressionGrammarAllowedChildSymbolsControl.cs">
    113114      <SubType>UserControl</SubType>
    … …  
    146147      <DependentUpon>GraphicalSymbolicExpressionTreeView.cs</DependentUpon>
    147148    </Compile>
    148     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs" />
    149149    <Compile Include="Properties\AssemblyInfo.cs" />
    150150    <Compile Include="SymbolicExpressionTreeChart.cs">
    … …  
    167167      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    168168      <Name>HeuristicLab.Collections-3.3</Name>
     169      <Private>False</Private>
    169170    </ProjectReference>
    170171    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    171172      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    172173      <Name>HeuristicLab.Common.Resources-3.3</Name>
     174      <Private>False</Private>
    173175    </ProjectReference>
    174176    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    175177      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    176178      <Name>HeuristicLab.Common-3.3</Name>
     179      <Private>False</Private>
    177180    </ProjectReference>
    178181    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    179182      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    180183      <Name>HeuristicLab.Core.Views-3.3</Name>
     184      <Private>False</Private>
    181185    </ProjectReference>
    182186    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    183187      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    184188      <Name>HeuristicLab.Core-3.3</Name>
     189      <Private>False</Private>
    185190    </ProjectReference>
    186191    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    187192      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    188193      <Name>HeuristicLab.Data.Views-3.3</Name>
     194      <Private>False</Private>
    189195    </ProjectReference>
    190196    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    191197      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    192198      <Name>HeuristicLab.Data-3.3</Name>
     199      <Private>False</Private>
    193200    </ProjectReference>
    194201    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    195202      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    196203      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     204      <Private>False</Private>
    197205    </ProjectReference>
    198206    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    199207      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    200208      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     209      <Private>False</Private>
    201210    </ProjectReference>
    202211    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    203212      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    204213      <Name>HeuristicLab.MainForm-3.3</Name>
     214      <Private>False</Private>
    205215    </ProjectReference>
    206216    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    207217      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    208218      <Name>HeuristicLab.Operators-3.3</Name>
     219      <Private>False</Private>
    209220    </ProjectReference>
    210221    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    211222      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    212223      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     224      <Private>False</Private>
    213225    </ProjectReference>
    214226    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    215227      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    216228      <Name>HeuristicLab.Optimization-3.3</Name>
     229      <Private>False</Private>
    217230    </ProjectReference>
    218231    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    219232      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    220233      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     234      <Private>False</Private>
    221235    </ProjectReference>
    222236    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    223237      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    224238      <Name>HeuristicLab.Random-3.3</Name>
     239      <Private>False</Private>
    225240    </ProjectReference>
    226241    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    227242      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    228243      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     244      <Private>False</Private>
    229245    </ProjectReference>
    230246  </ItemGroup>
    231247  <ItemGroup>
    232248    <None Include="HeuristicLab.snk" />
    233     <None Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs.frame" />
    234     <None Include="Properties\AssemblyInfo.frame" />
     249    <None Include="Plugin.cs.frame" />
     250    <None Include="Properties\AssemblyInfo.cs.frame" />
    235251  </ItemGroup>
    236252  <ItemGroup>
    … …  
    266282
    267283call PreBuildEvent.cmd
    268 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs"</PreBuildEvent>
     284</PreBuildEvent>
    269285  </PropertyGroup>
    270286</Project>
Note: See TracChangeset for help on using the changeset viewer.