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.Encodings.SymbolicExpressionTreeEncoding.Views/3.3

    • Property svn:ignore

      •  

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

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

    r5832 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>
    … …  
    115115      <DependentUpon>DefaultSymbolicExpressionGrammarView.cs</DependentUpon>
    116116    </Compile>
     117    <Compile Include="Plugin.cs" />
    117118    <Compile Include="SymbolView.cs">
    118119      <SubType>UserControl</SubType>
    … …  
    127128      <DependentUpon>GraphicalSymbolicExpressionTreeView.cs</DependentUpon>
    128129    </Compile>
    129     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs" />
    130130    <Compile Include="Properties\AssemblyInfo.cs" />
    131131    <Compile Include="SymbolicExpressionTreeChart.cs">
    … …  
    147147      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    148148      <Name>HeuristicLab.Collections-3.3</Name>
     149      <Private>False</Private>
    149150    </ProjectReference>
    150151    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    151152      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    152153      <Name>HeuristicLab.Common-3.3</Name>
     154      <Private>False</Private>
    153155    </ProjectReference>
    154156    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    155157      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    156158      <Name>HeuristicLab.Core.Views-3.3</Name>
     159      <Private>False</Private>
    157160    </ProjectReference>
    158161    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    159162      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    160163      <Name>HeuristicLab.Core-3.3</Name>
     164      <Private>False</Private>
    161165    </ProjectReference>
    162166    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    163167      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    164168      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     169      <Private>False</Private>
    165170    </ProjectReference>
    166171    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    167172      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    168173      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     174      <Private>False</Private>
    169175    </ProjectReference>
    170176    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    171177      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    172178      <Name>HeuristicLab.MainForm-3.3</Name>
     179      <Private>False</Private>
    173180    </ProjectReference>
    174181    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    175182      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    176183      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     184      <Private>False</Private>
    177185    </ProjectReference>
    178186  </ItemGroup>
    179187  <ItemGroup>
    180188    <None Include="HeuristicLab.snk" />
    181     <None Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs.frame" />
    182     <None Include="Properties\AssemblyInfo.frame" />
     189    <None Include="Plugin.cs.frame" />
     190    <None Include="Properties\AssemblyInfo.cs.frame" />
    183191  </ItemGroup>
    184192  <ItemGroup>
    … …  
    214222
    215223call PreBuildEvent.cmd
    216 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs"</PreBuildEvent>
     224</PreBuildEvent>
    217225  </PropertyGroup>
    218226</Project>
Note: See TracChangeset for help on using the changeset viewer.