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.Clients.Common/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj

    r5710 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>
    … …  
    5858  </PropertyGroup>
    5959  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    60     <OutputPath>bin\x64\Release\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>TRACE</DefineConstants>
    6262    <Optimize>true</Optimize>
    6363    <DebugType>pdbonly</DebugType>
    6464    <PlatformTarget>x64</PlatformTarget>
    65     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     65    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    6666    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    6767    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    7575  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7676    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x86\Debug\</OutputPath>
     77    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7878    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7979    <DebugType>full</DebugType>
    … …  
    8989  </PropertyGroup>
    9090  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    91     <OutputPath>bin\x86\Release\</OutputPath>
     91    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9292    <DefineConstants>TRACE</DefineConstants>
    9393    <Optimize>true</Optimize>
    9494    <DebugType>pdbonly</DebugType>
    9595    <PlatformTarget>x86</PlatformTarget>
    96     <CodeAnalysisLogFile>bin\Release\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     96    <CodeAnalysisLogFile>$(SolutionDir)\bin\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9797    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9898    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    … …  
    117117  <ItemGroup>
    118118    <Compile Include="ClientFactory.cs" />
    119     <Compile Include="HeuristicLabClientsCommonPlugin.cs" />
    120119    <Compile Include="PasswordDialog.cs">
    121120      <SubType>Form</SubType>
    … …  
    124123      <DependentUpon>PasswordDialog.cs</DependentUpon>
    125124    </Compile>
     125    <Compile Include="Plugin.cs" />
    126126    <Compile Include="Properties\AssemblyInfo.cs" />
    127127    <Compile Include="Properties\Settings.Designer.cs">
    … …  
    131131    </Compile>
    132132    <None Include="app.config" />
    133     <None Include="Properties\AssemblyInfo.frame" />
     133    <None Include="Properties\AssemblyInfo.cs.frame" />
    134134    <None Include="Properties\Settings.settings">
    135135      <Generator>SettingsSingleFileGenerator</Generator>
    … …  
    139139  <ItemGroup>
    140140    <None Include="HeuristicLab.snk" />
    141     <None Include="HeuristicLabClientsCommonPlugin.cs.frame" />
     141    <None Include="Plugin.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\HeuristicLabClientsCommonPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabClientsCommonPlugin.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.