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

    • Property svn:ignore

      •  

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

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

    r5163 r6866  
    2121    <DebugType>full</DebugType>
    2222    <Optimize>false</Optimize>
    23     <OutputPath>bin\Debug\</OutputPath>
     23    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2424    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2525    <ErrorReport>prompt</ErrorReport>
    … …  
    2929    <DebugType>pdbonly</DebugType>
    3030    <Optimize>true</Optimize>
    31     <OutputPath>bin\Release\</OutputPath>
     31    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3232    <DefineConstants>TRACE</DefineConstants>
    3333    <ErrorReport>prompt</ErrorReport>
    … …  
    4242  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4343    <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>bin\x64\Debug\</OutputPath>
     44    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4545    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4646    <DebugType>full</DebugType>
    … …  
    5757  </PropertyGroup>
    5858  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    59     <OutputPath>bin\x64\Release\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>TRACE</DefineConstants>
    6161    <Optimize>true</Optimize>
    6262    <DebugType>pdbonly</DebugType>
    6363    <PlatformTarget>x64</PlatformTarget>
    64     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     64    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6565    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6666    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7272  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7373    <DebugSymbols>true</DebugSymbols>
    74     <OutputPath>bin\x86\Debug\</OutputPath>
     74    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7575    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7676    <DebugType>full</DebugType>
    … …  
    8787  </PropertyGroup>
    8888  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    89     <OutputPath>bin\x86\Release\</OutputPath>
     89    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9090    <DefineConstants>TRACE</DefineConstants>
    9191    <Optimize>true</Optimize>
    9292    <DebugType>pdbonly</DebugType>
    9393    <PlatformTarget>x86</PlatformTarget>
    94     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     94    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9595    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9696    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    119119      <DependentUpon>ConfusionMatrixView.cs</DependentUpon>
    120120    </Compile>
    121     <Compile Include="HeuristicLabProblemsDataAnalysisClassificationViewsPlugin.cs" />
     121    <Compile Include="Plugin.cs" />
    122122    <Compile Include="Properties\AssemblyInfo.cs" />
    123123    <Compile Include="RocCurvesView.cs">
    … …  
    136136  <ItemGroup>
    137137    <None Include="HeuristicLab.snk" />
    138     <None Include="HeuristicLabProblemsDataAnalysisClassificationViewsPlugin.cs.frame" />
    139     <None Include="Properties\AssemblyInfo.frame" />
     138    <None Include="Plugin.cs.frame" />
     139    <None Include="Properties\AssemblyInfo.cs.frame" />
    140140  </ItemGroup>
    141141  <ItemGroup>
    … …  
    143143      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    144144      <Name>HeuristicLab.Common-3.3</Name>
     145      <Private>False</Private>
    145146    </ProjectReference>
    146147    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    147148      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    148149      <Name>HeuristicLab.Core-3.3</Name>
     150      <Private>False</Private>
    149151    </ProjectReference>
    150152    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    151153      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    152154      <Name>HeuristicLab.Data-3.3</Name>
     155      <Private>False</Private>
    153156    </ProjectReference>
    154157    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    155158      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    156159      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     160      <Private>False</Private>
    157161    </ProjectReference>
    158162    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    159163      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    160164      <Name>HeuristicLab.MainForm-3.3</Name>
     165      <Private>False</Private>
    161166    </ProjectReference>
    162167    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    163168      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    164169      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     170      <Private>False</Private>
    165171    </ProjectReference>
    166172    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj">
    167173      <Project>{D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}</Project>
    168174      <Name>HeuristicLab.Problems.DataAnalysis.Classification-3.3</Name>
     175      <Private>False</Private>
    169176    </ProjectReference>
    170177    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    171178      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    172179      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     180      <Private>False</Private>
    173181    </ProjectReference>
    174182    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    175183      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    176184      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     185      <Private>False</Private>
    177186    </ProjectReference>
    178187    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    179188      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    180189      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     190      <Private>False</Private>
    181191    </ProjectReference>
    182192  </ItemGroup>
    … …  
    189199
    190200call PreBuildEvent.cmd
    191 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25HeuristicLabProblemsDataAnalysisClassificationViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisClassificationViewsPlugin.cs"</PreBuildEvent>
     201</PreBuildEvent>
    192202  </PropertyGroup>
    193203  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.