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.SequentialEngine/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj

    r5163 r6866  
    1919    </UpgradeBackupLocation>
    2020    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    21     <TargetFrameworkProfile></TargetFrameworkProfile>
     21    <TargetFrameworkProfile>
     22    </TargetFrameworkProfile>
    2223    <PublishUrl>publish\</PublishUrl>
    2324    <Install>true</Install>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    5455    <WarningLevel>4</WarningLevel>
    5556    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    56     <DocumentationFile>bin\Release\HeuristicLab.SequentialEngine-3.3.xml</DocumentationFile>
     57    <DocumentationFile>
     58    </DocumentationFile>
    5759    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5860  </PropertyGroup>
    5961  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6062    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x86\Debug\</OutputPath>
     63    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6264    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6365    <DebugType>full</DebugType>
    … …  
    6769  </PropertyGroup>
    6870  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    69     <OutputPath>bin\x86\Release\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7072    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x86\Release\HeuristicLab.SequentialEngine-3.3.xml</DocumentationFile>
     73    <DocumentationFile>
     74    </DocumentationFile>
    7275    <Optimize>true</Optimize>
    7376    <DebugType>pdbonly</DebugType>
    … …  
    7881  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7982    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x64\Debug\</OutputPath>
     83    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8184    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8285    <DebugType>full</DebugType>
    … …  
    8689  </PropertyGroup>
    8790  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    88     <OutputPath>bin\x64\Release\</OutputPath>
     91    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8992    <DefineConstants>TRACE</DefineConstants>
    90     <DocumentationFile>bin\x64\Release\HeuristicLab.SequentialEngine-3.3.XML</DocumentationFile>
     93    <DocumentationFile>
     94    </DocumentationFile>
    9195    <Optimize>true</Optimize>
    9296    <DebugType>pdbonly</DebugType>
    … …  
    104108  </ItemGroup>
    105109  <ItemGroup>
    106     <None Include="HeuristicLabSequentialEnginePlugin.cs.frame" />
    107     <Compile Include="HeuristicLabSequentialEnginePlugin.cs" />
     110    <None Include="Plugin.cs.frame" />
     111    <Compile Include="Plugin.cs" />
    108112    <Compile Include="Properties\AssemblyInfo.cs" />
    109113    <Compile Include="SequentialEngine.cs" />
    … …  
    111115  <ItemGroup>
    112116    <None Include="HeuristicLab.snk" />
    113     <None Include="Properties\AssemblyInfo.frame" />
     117    <None Include="Properties\AssemblyInfo.cs.frame" />
    114118  </ItemGroup>
    115119  <ItemGroup>
    … …  
    117121      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    118122      <Name>HeuristicLab.Common-3.3</Name>
     123      <Private>False</Private>
    119124    </ProjectReference>
    120125    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    121126      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    122127      <Name>HeuristicLab.Core-3.3</Name>
     128      <Private>False</Private>
    123129    </ProjectReference>
    124130    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    125131      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    126132      <Name>HeuristicLab.Persistence-3.3</Name>
     133      <Private>False</Private>
    127134    </ProjectReference>
    128135    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    129136      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    130137      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     138      <Private>False</Private>
    131139    </ProjectReference>
    132140  </ItemGroup>
    … …  
    163171
    164172call PreBuildEvent.cmd
    165 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabSequentialEnginePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabSequentialEnginePlugin.cs"</PreBuildEvent>
     173</PreBuildEvent>
    166174  </PropertyGroup>
    167175</Project>
Note: See TracChangeset for help on using the changeset viewer.