Changeset 5163 for trunk/tools/ConfigMerger

Timestamp:

12/23/10 00:07:58 (14 years ago)

Author:

swagner

Message:

Reintegrated .NET 4.0 migration branch (#1350)

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/ConfigMerger/ConfigMerger.csproj (modified) (3 diffs)
• tools/ConfigMerger/app.config (copied) (copied from branches/NET40/tools/ConfigMerger/app.config)

trunk/tools/ConfigMerger/ConfigMerger.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Tools.ConfigMerger</RootNamespace>
     <AssemblyName>ConfigMerger</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -35 +35 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -94 +95 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />