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

    • Property svn:ignore

      •  

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

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

    r6803 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>
    … …  
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
     97    </Reference>
    9598    <Reference Include="System" />
    9699    <Reference Include="System.Core">
    … …  
    110113  </ItemGroup>
    111114  <ItemGroup>
     115    <Compile Include="Plugin.cs" />
    112116    <Compile Include="SymbolicDataAnalysisSolutionResponseFunctionView.cs">
    113117      <SubType>UserControl</SubType>
    … …  
    171175    </Compile>
    172176    <None Include="HeuristicLab.snk" />
    173     <None Include="HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs.frame" />
    174     <None Include="Properties\AssemblyInfo.frame" />
    175     <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs" />
     177    <None Include="Plugin.cs.frame" />
     178    <None Include="Properties\AssemblyInfo.cs.frame" />
    176179    <Compile Include="RunCollectionVariableImpactView.cs">
    177180      <SubType>UserControl</SubType>
    … …  
    186189      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    187190      <Name>HeuristicLab.Collections-3.3</Name>
     191      <Private>False</Private>
    188192    </ProjectReference>
    189193    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    190194      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    191195      <Name>HeuristicLab.Common.Resources-3.3</Name>
     196      <Private>False</Private>
    192197    </ProjectReference>
    193198    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    194199      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    195200      <Name>HeuristicLab.Common-3.3</Name>
     201      <Private>False</Private>
    196202    </ProjectReference>
    197203    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    198204      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    199205      <Name>HeuristicLab.Core.Views-3.3</Name>
     206      <Private>False</Private>
    200207    </ProjectReference>
    201208    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    202209      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    203210      <Name>HeuristicLab.Core-3.3</Name>
     211      <Private>False</Private>
    204212    </ProjectReference>
    205213    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    206214      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    207215      <Name>HeuristicLab.Data.Views-3.3</Name>
     216      <Private>False</Private>
    208217    </ProjectReference>
    209218    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    210219      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    211220      <Name>HeuristicLab.Data-3.3</Name>
     221      <Private>False</Private>
    212222    </ProjectReference>
    213223    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
    214224      <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
    215225      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
     226      <Private>False</Private>
    216227    </ProjectReference>
    217228    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    218229      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    219230      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    222       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    223       <Name>ALGLIB-3.1.0</Name>
    224     </ProjectReference>
    225     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    226       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    227       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
     231      <Private>False</Private>
    228232    </ProjectReference>
    229233    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    230234      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    231235      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     236      <Private>False</Private>
    232237    </ProjectReference>
    233238    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    234239      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    235240      <Name>HeuristicLab.MainForm-3.3</Name>
     241      <Private>False</Private>
    236242    </ProjectReference>
    237243    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    238244      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    239245      <Name>HeuristicLab.Operators-3.3</Name>
     246      <Private>False</Private>
    240247    </ProjectReference>
    241248    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    242249      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    243250      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     251      <Private>False</Private>
    244252    </ProjectReference>
    245253    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    246254      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    247255      <Name>HeuristicLab.Optimization-3.3</Name>
     256      <Private>False</Private>
    248257    </ProjectReference>
    249258    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    250259      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    251260      <Name>HeuristicLab.Parameters-3.3</Name>
     261      <Private>False</Private>
    252262    </ProjectReference>
    253263    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    254264      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    255265      <Name>HeuristicLab.Persistence-3.3</Name>
     266      <Private>False</Private>
    256267    </ProjectReference>
    257268    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    258269      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    259270      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     271      <Private>False</Private>
    260272    </ProjectReference>
    261273    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    262274      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    263275      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     276      <Private>False</Private>
    264277    </ProjectReference>
    265278    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    266279      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    267280      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     281      <Private>False</Private>
    268282    </ProjectReference>
    269283    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    270284      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    271285      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     286      <Private>False</Private>
    272287    </ProjectReference>
    273288  </ItemGroup>
    … …  
    304319
    305320call PreBuildEvent.cmd
    306 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs"</PreBuildEvent>
     321</PreBuildEvent>
    307322  </PropertyGroup>
    308323</Project>
Note: See TracChangeset for help on using the changeset viewer.