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

    • Property svn:ignore

      •  

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

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

    r6807 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>
    … …  
    122122      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
    123123    </Compile>
     124    <Compile Include="Plugin.cs" />
    124125    <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.cs">
    125126      <SubType>UserControl</SubType>
    … …  
    281282    </Compile>
    282283    <None Include="HeuristicLab.snk" />
    283     <None Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" />
    284     <None Include="Properties\AssemblyInfo.frame" />
     284    <None Include="Plugin.cs.frame" />
     285    <None Include="Properties\AssemblyInfo.cs.frame" />
    285286    <Compile Include="DataAnalysisProblemView.cs">
    286287      <SubType>UserControl</SubType>
    … …  
    289290      <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
    290291    </Compile>
    291     <Compile Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs" />
    292292    <Compile Include="Properties\AssemblyInfo.cs" />
    293293  </ItemGroup>
    … …  
    296296      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    297297      <Name>HeuristicLab.Collections-3.3</Name>
     298      <Private>False</Private>
    298299    </ProjectReference>
    299300    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    300301      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    301302      <Name>HeuristicLab.Common.Resources-3.3</Name>
     303      <Private>False</Private>
    302304    </ProjectReference>
    303305    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    304306      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    305307      <Name>HeuristicLab.Common-3.3</Name>
     308      <Private>False</Private>
    306309    </ProjectReference>
    307310    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    308311      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    309312      <Name>HeuristicLab.Core.Views-3.3</Name>
     313      <Private>False</Private>
    310314    </ProjectReference>
    311315    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    312316      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    313317      <Name>HeuristicLab.Core-3.3</Name>
     318      <Private>False</Private>
    314319    </ProjectReference>
    315320    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    316321      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    317322      <Name>HeuristicLab.Data.Views-3.3</Name>
     323      <Private>False</Private>
    318324    </ProjectReference>
    319325    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    320326      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    321327      <Name>HeuristicLab.Data-3.3</Name>
    322     </ProjectReference>
    323     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    324       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    325       <Name>ALGLIB-3.1.0</Name>
    326     </ProjectReference>
    327     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    328       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    329       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
     328      <Private>False</Private>
    330329    </ProjectReference>
    331330    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    332331      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    333332      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     333      <Private>False</Private>
    334334    </ProjectReference>
    335335    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    336336      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    337337      <Name>HeuristicLab.MainForm-3.3</Name>
     338      <Private>False</Private>
    338339    </ProjectReference>
    339340    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    340341      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    341342      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     343      <Private>False</Private>
    342344    </ProjectReference>
    343345    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    344346      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    345347      <Name>HeuristicLab.Optimization-3.3</Name>
     348      <Private>False</Private>
    346349    </ProjectReference>
    347350    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
    348351      <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
    349352      <Name>HeuristicLab.Optimizer-3.3</Name>
     353      <Private>False</Private>
    350354    </ProjectReference>
    351355    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    352356      <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    353357      <Name>HeuristicLab.Parameters.Views-3.3</Name>
     358      <Private>False</Private>
    354359    </ProjectReference>
    355360    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    356361      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    357362      <Name>HeuristicLab.Persistence-3.3</Name>
     363      <Private>False</Private>
    358364    </ProjectReference>
    359365    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    360366      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    361367      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     368      <Private>False</Private>
    362369    </ProjectReference>
    363370    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    364371      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    365372      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     373      <Private>False</Private>
    366374    </ProjectReference>
    367375    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    368376      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    369377      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     378      <Private>False</Private>
    370379    </ProjectReference>
    371380  </ItemGroup>
    … …  
    402411
    403412call PreBuildEvent.cmd
    404 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisViewsPlugin.cs"</PreBuildEvent>
     413</PreBuildEvent>
    405414  </PropertyGroup>
    406415</Project>
Note: See TracChangeset for help on using the changeset viewer.