Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/23/10 00:07:58 (14 years ago)
Author:
swagner
Message:

Reintegrated .NET 4.0 migration branch (#1350)

Location:
trunk
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/ConfigMerger/ConfigMerger.csproj

    r4149 r5163  
    1111    <RootNamespace>HeuristicLab.Tools.ConfigMerger</RootNamespace>
    1212    <AssemblyName>ConfigMerger</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
     
    3535    <UseApplicationTrust>false</UseApplicationTrust>
    3636    <BootstrapperEnabled>true</BootstrapperEnabled>
     37    <TargetFrameworkProfile />
    3738  </PropertyGroup>
    3839  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    9495  </ItemGroup>
    9596  <ItemGroup>
     97    <None Include="app.config" />
    9698    <None Include="HeuristicLab.snk" />
    9799    <None Include="Properties\AssemblyInfo.frame" />
Note: See TracChangeset for help on using the changeset viewer.