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

    • Property svn:ignore

      •  

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

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

    r5163 r6866  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>bin\Debug\</OutputPath>
     22    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
    … …  
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>bin\Release\</OutputPath>
     30    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
    … …  
    4141  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4242    <DebugSymbols>true</DebugSymbols>
    43     <OutputPath>bin\x86\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <DebugType>full</DebugType>
    … …  
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    58     <OutputPath>bin\x86\Release\</OutputPath>
     58    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5959    <DefineConstants>TRACE</DefineConstants>
    6060    <Optimize>true</Optimize>
    6161    <DebugType>pdbonly</DebugType>
    6262    <PlatformTarget>x86</PlatformTarget>
    63     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Algorithms.DataAnalysis.Views.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     63    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Algorithms.DataAnalysis.Views.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6464    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6565    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7373  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7474    <DebugSymbols>true</DebugSymbols>
    75     <OutputPath>bin\x64\Debug\</OutputPath>
     75    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7676    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7777    <DebugType>full</DebugType>
    … …  
    8888  </PropertyGroup>
    8989  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    90     <OutputPath>bin\x64\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <Optimize>true</Optimize>
    9393    <DebugType>pdbonly</DebugType>
    9494    <PlatformTarget>x64</PlatformTarget>
    95     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Algorithms.DataAnalysis.Views.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     95    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Algorithms.DataAnalysis.Views.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9696    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9797    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    120120      <DependentUpon>CrossValidationView.cs</DependentUpon>
    121121    </Compile>
    122     <Compile Include="HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs" />
     122    <Compile Include="Plugin.cs" />
    123123    <Compile Include="Properties\AssemblyInfo.cs" />
    124124  </ItemGroup>
    125125  <ItemGroup>
    126126    <None Include="HeuristicLab.snk" />
    127     <None Include="HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs.frame" />
    128     <None Include="Properties\AssemblyInfo.frame" />
     127    <None Include="Plugin.cs.frame" />
     128    <None Include="Properties\AssemblyInfo.cs.frame" />
    129129  </ItemGroup>
    130130  <ItemGroup>
    … …  
    132132      <Project>{A8D5676D-9662-437A-B44D-ECB4046CDE12}</Project>
    133133      <Name>HeuristicLab.Algorithms.DataAnalysis-3.3</Name>
     134      <Private>False</Private>
    134135    </ProjectReference>
    135136    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    136137      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    137138      <Name>HeuristicLab.Collections-3.3</Name>
     139      <Private>False</Private>
    138140    </ProjectReference>
    139141    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    140142      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    141143      <Name>HeuristicLab.Common.Resources-3.3</Name>
     144      <Private>False</Private>
    142145    </ProjectReference>
    143146    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    144147      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    145148      <Name>HeuristicLab.Common-3.3</Name>
     149      <Private>False</Private>
    146150    </ProjectReference>
    147151    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    148152      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    149153      <Name>HeuristicLab.Core.Views-3.3</Name>
     154      <Private>False</Private>
    150155    </ProjectReference>
    151156    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    152157      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    153158      <Name>HeuristicLab.Core-3.3</Name>
     159      <Private>False</Private>
    154160    </ProjectReference>
    155161    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    156162      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    157163      <Name>HeuristicLab.Data.Views-3.3</Name>
     164      <Private>False</Private>
    158165    </ProjectReference>
    159166    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    160167      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    161168      <Name>HeuristicLab.Data-3.3</Name>
     169      <Private>False</Private>
    162170    </ProjectReference>
    163171    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    164172      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    165173      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     174      <Private>False</Private>
    166175    </ProjectReference>
    167176    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    168177      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    169178      <Name>HeuristicLab.MainForm-3.3</Name>
     179      <Private>False</Private>
    170180    </ProjectReference>
    171181    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    172182      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    173183      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     184      <Private>False</Private>
    174185    </ProjectReference>
    175186    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    176187      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    177188      <Name>HeuristicLab.Optimization-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\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    184197      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    185198      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     199      <Private>False</Private>
    186200    </ProjectReference>
    187201  </ItemGroup>
    … …  
    195209
    196210      call PreBuildEvent.cmd
    197       SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs"
    198211</PreBuildEvent>
    199212  </PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.