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

    • Property svn:ignore

      •  

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

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

    r5830 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="SymbolicDiscriminantFunctionClassificationSolutionView.cs">
    113114      <SubType>UserControl</SubType>
    … …  
    117118    </Compile>
    118119    <None Include="HeuristicLab.snk" />
    119     <None Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationViewsPlugin.cs.frame" />
    120     <None Include="Properties\AssemblyInfo.frame" />
    121     <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationViewsPlugin.cs" />
     120    <None Include="Plugin.cs.frame" />
     121    <None Include="Properties\AssemblyInfo.cs.frame" />
    122122    <Compile Include="InteractiveSymbolicDiscriminantFunctionClassificationSolutionSimplifierView.cs">
    123123      <SubType>UserControl</SubType>
    … …  
    132132      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    133133      <Name>HeuristicLab.Collections-3.3</Name>
     134      <Private>False</Private>
    134135    </ProjectReference>
    135136    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    136137      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    137138      <Name>HeuristicLab.Common-3.3</Name>
     139      <Private>False</Private>
    138140    </ProjectReference>
    139141    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    140142      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    141143      <Name>HeuristicLab.Core.Views-3.3</Name>
     144      <Private>False</Private>
    142145    </ProjectReference>
    143146    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    144147      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    145148      <Name>HeuristicLab.Core-3.3</Name>
     149      <Private>False</Private>
    146150    </ProjectReference>
    147151    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    148152      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    149153      <Name>HeuristicLab.Data-3.3</Name>
     154      <Private>False</Private>
    150155    </ProjectReference>
    151156    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    152157      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    153158      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     159      <Private>False</Private>
    154160    </ProjectReference>
    155161    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    156162      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    157163      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     164      <Private>False</Private>
    158165    </ProjectReference>
    159166    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    160167      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    161168      <Name>HeuristicLab.MainForm-3.3</Name>
     169      <Private>False</Private>
    162170    </ProjectReference>
    163171    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    164172      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    165173      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     174      <Private>False</Private>
    166175    </ProjectReference>
    167176    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    168177      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    169178      <Name>HeuristicLab.Optimization-3.3</Name>
     179      <Private>False</Private>
    170180    </ProjectReference>
    171181    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    172182      <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    173183      <Name>HeuristicLab.Parameters.Views-3.3</Name>
     184      <Private>False</Private>
    174185    </ProjectReference>
    175186    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    176187      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    177188      <Name>HeuristicLab.Persistence-3.3</Name>
     189      <Private>False</Private>
    178190    </ProjectReference>
    179191    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    180192      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    181193      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     194      <Private>False</Private>
    182195    </ProjectReference>
    183196    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
    184197      <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
    185198      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
     199      <Private>False</Private>
    186200    </ProjectReference>
    187201    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj">
    188202      <Project>{7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}</Project>
    189203      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</Name>
     204      <Private>False</Private>
    190205    </ProjectReference>
    191206    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    192207      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    193208      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     209      <Private>False</Private>
    194210    </ProjectReference>
    195211    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    196212      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
    197213      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
     214      <Private>False</Private>
    198215    </ProjectReference>
    199216    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    200217      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    201218      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     219      <Private>False</Private>
    202220    </ProjectReference>
    203221  </ItemGroup>
    … …  
    234252
    235253call PreBuildEvent.cmd
    236 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicClassificationViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicClassificationViewsPlugin.cs"</PreBuildEvent>
     254</PreBuildEvent>
    237255  </PropertyGroup>
    238256</Project>
Note: See TracChangeset for help on using the changeset viewer.