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.Problems.DataAnalysis.Views/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

    r5809 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>
    … …  
    111111  <ItemGroup>
    112112    <None Include="HeuristicLab.snk" />
    113     <None Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" />
    114     <None Include="Properties\AssemblyInfo.frame" />
     113    <None Include="Plugin.cs.frame" />
     114    <None Include="Properties\AssemblyInfo.cs.frame" />
    115115    <Compile Include="DataAnalysisSolutionView.cs">
    116116      <SubType>UserControl</SubType>
    … …  
    119119      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
    120120    </Compile>
     121    <Compile Include="Plugin.cs" />
    121122    <Compile Include="ResultsView.cs">
    122123      <SubType>UserControl</SubType>
    … …  
    149150      <DependentUpon>DataAnalysisProblemDataView.cs</DependentUpon>
    150151    </Compile>
    151     <Compile Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs" />
    152152    <Compile Include="LineChartView.cs">
    153153      <SubType>UserControl</SubType>
    … …  
    222222      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    223223      <Name>HeuristicLab.Collections-3.3</Name>
     224      <Private>False</Private>
    224225    </ProjectReference>
    225226    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    226227      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    227228      <Name>HeuristicLab.Common-3.3</Name>
     229      <Private>False</Private>
    228230    </ProjectReference>
    229231    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    230232      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    231233      <Name>HeuristicLab.Core.Views-3.3</Name>
     234      <Private>False</Private>
    232235    </ProjectReference>
    233236    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    234237      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    235238      <Name>HeuristicLab.Core-3.3</Name>
     239      <Private>False</Private>
    236240    </ProjectReference>
    237241    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    238242      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    239243      <Name>HeuristicLab.Data.Views-3.3</Name>
     244      <Private>False</Private>
    240245    </ProjectReference>
    241246    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    242247      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    243248      <Name>HeuristicLab.Data-3.3</Name>
     249      <Private>False</Private>
    244250    </ProjectReference>
    245251    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
    246252      <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
    247253      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
     254      <Private>False</Private>
    248255    </ProjectReference>
    249256    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    250257      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    251258      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    252     </ProjectReference>
    253     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    254       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    255       <Name>ALGLIB-3.1.0</Name>
    256     </ProjectReference>
    257     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    258       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    259       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
     259      <Private>False</Private>
    260260    </ProjectReference>
    261261    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    262262      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    263263      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     264      <Private>False</Private>
    264265    </ProjectReference>
    265266    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    266267      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    267268      <Name>HeuristicLab.MainForm-3.3</Name>
     269      <Private>False</Private>
    268270    </ProjectReference>
    269271    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    270272      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    271273      <Name>HeuristicLab.Operators-3.3</Name>
     274      <Private>False</Private>
    272275    </ProjectReference>
    273276    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    274277      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    275278      <Name>HeuristicLab.Optimization-3.3</Name>
     279      <Private>False</Private>
    276280    </ProjectReference>
    277281    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    278282      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    279283      <Name>HeuristicLab.Parameters-3.3</Name>
     284      <Private>False</Private>
    280285    </ProjectReference>
    281286    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    282287      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    283288      <Name>HeuristicLab.Persistence-3.3</Name>
     289      <Private>False</Private>
    284290    </ProjectReference>
    285291    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    286292      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    287293      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     294      <Private>False</Private>
    288295    </ProjectReference>
    289296    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    290297      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    291298      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     299      <Private>False</Private>
    292300    </ProjectReference>
    293301    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    294302      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    295303      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     304      <Private>False</Private>
    296305    </ProjectReference>
    297306    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    298307      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    299308      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     309      <Private>False</Private>
    300310    </ProjectReference>
    301311  </ItemGroup>
    … …  
    332342
    333343call PreBuildEvent.cmd
    334 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisViewsPlugin.cs"</PreBuildEvent>
     344</PreBuildEvent>
    335345  </PropertyGroup>
    336346</Project>
Note: See TracChangeset for help on using the changeset viewer.