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

    • Property svn:ignore

      •  

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

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

    r6558 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|x86' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    68     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>bin\x64\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    108108  </ItemGroup>
    109109  <ItemGroup>
    110     <None Include="HeuristicLabCommonResourcesPlugin.cs.frame" />
     110    <None Include="Plugin.cs.frame" />
    111111    <Compile Include="HeuristicLab.Designer.cs">
    112112      <AutoGen>True</AutoGen>
    … …  
    114114      <DependentUpon>HeuristicLab.resx</DependentUpon>
    115115    </Compile>
    116     <Compile Include="HeuristicLabCommonResourcesPlugin.cs" />
     116    <Compile Include="Plugin.cs" />
    117117    <Compile Include="Properties\AssemblyInfo.cs" />
    118118    <Compile Include="VSImageLibrary.Designer.cs">
    … …  
    124124  <ItemGroup>
    125125    <None Include="HeuristicLab.snk" />
    126     <None Include="Properties\AssemblyInfo.frame" />
     126    <None Include="Properties\AssemblyInfo.cs.frame" />
    127127  </ItemGroup>
    128128  <ItemGroup>
    … …  
    130130      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    131131      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     132      <Private>False</Private>
    132133    </ProjectReference>
    133134  </ItemGroup>
    … …  
    500501
    501502call PreBuildEvent.cmd
    502 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabCommonResourcesPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabCommonResourcesPlugin.cs"</PreBuildEvent>
     503</PreBuildEvent>
    503504  </PropertyGroup>
    504505</Project>
Note: See TracChangeset for help on using the changeset viewer.