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.Visualization.ChartControlsExtensions/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj

    r6644 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.Visualization.ChartControlExtensions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     63    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Visualization.ChartControlExtensions-3.3.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.Visualization.ChartControlExtensions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     95    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Visualization.ChartControlExtensions-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9696    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9797    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    121121      <DependentUpon>EnhancedChart.cs</DependentUpon>
    122122    </Compile>
    123     <Compile Include="HeuristicLabVisualizationChartControlsExtensionsPlugin.cs" />
    124123    <Compile Include="HistogramControl.cs">
    125124      <SubType>UserControl</SubType>
    … …  
    134133      <DependentUpon>ImageExportDialog.cs</DependentUpon>
    135134    </Compile>
     135    <Compile Include="Plugin.cs" />
    136136    <Compile Include="Properties\AssemblyInfo.cs" />
    137137  </ItemGroup>
    138138  <ItemGroup>
    139139    <None Include="HeuristicLab.snk" />
    140     <None Include="HeuristicLabVisualizationChartControlsExtensionsPlugin.cs.frame" />
    141     <None Include="Properties\AssemblyInfo.frame" />
     140    <None Include="Plugin.cs.frame" />
     141    <None Include="Properties\AssemblyInfo.cs.frame" />
    142142  </ItemGroup>
    143143  <ItemGroup>
    … …  
    145145      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    146146      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     147      <Private>False</Private>
    147148    </ProjectReference>
    148149  </ItemGroup>
    … …  
    155156
    156157call PreBuildEvent.cmd
    157 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabVisualizationChartControlsExtensionsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabVisualizationChartControlsExtensionsPlugin.cs"</PreBuildEvent>
     158</PreBuildEvent>
    158159  </PropertyGroup>
    159160  <!-- 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.