Update csproj files

author: Marek Safar <marek.safar@gmail.com> 2013-02-07 19:33:49 +0400
committer: Marek Safar <marek.safar@gmail.com> 2013-02-07 19:34:23 +0400
commit: 78318771d52403e6b0588eb04dd8f74afa7f43f8 (patch)
tree: 348729d49b56c64b5974cb5465a862cb921f734a /mcs/class/Microsoft.Build.Engine
parent: 425d8ff70911438c1600912e5dfed0a0c7437491 (diff)
8 files changed, 728 insertions, 728 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj
index 493cf82ddbd..681e98902f4 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_2_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{F9FF05AC-F1E0-4BA5-BD84-54C71B46C8B6}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_2_0</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-net_2_0</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,91 +27,92 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
-   <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
+    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -121,42 +121,40 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.dll</HintPath>
-    </Reference>
-
+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>
+      <Name>corlib\corlib-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System\System-net_2_0-2.csproj">
+      <Project>{08A2FAB2-A213-451E-AD93-19B409BF1B5A}</Project>
+      <Name>System\System-net_2_0-2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">
+      <Project>{45BA4F7D-9E8C-42F8-975F-F2EAA0300B6C}</Project>
+      <Name>System.Core\System.Core-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
+      <Project>{A892207C-64E0-4FCA-8541-A3C71099AA13}</Project>
+      <Name>System.XML\System.Xml-net_2_0-1</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">
+      <Project>{75B122DA-F2B9-4F68-A4E9-5EEF97ECBAB2}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">
+      <Project>{C58C325B-D757-4335-97FB-75A117978082}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj
index 6d334fda5aa..e21a6df1a41 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_3_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{FDD46689-2109-4990-87C8-488E04A46008}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_3_5</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-net_3_5</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,91 +27,92 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_3_5,./../../class/lib/net_2_0</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_3_5,./../../class/lib/net_2_0</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
-   <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
+    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -121,42 +121,40 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_3_5\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_3_5/Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_3_5/Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v3.5.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.v3.5.dll</HintPath>
-    </Reference>
-
+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>
+      <Name>corlib\corlib-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System\System-net_2_0-2.csproj">
+      <Project>{08A2FAB2-A213-451E-AD93-19B409BF1B5A}</Project>
+      <Name>System\System-net_2_0-2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">
+      <Project>{45BA4F7D-9E8C-42F8-975F-F2EAA0300B6C}</Project>
+      <Name>System.Core\System.Core-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
+      <Project>{A892207C-64E0-4FCA-8541-A3C71099AA13}</Project>
+      <Name>System.XML\System.Xml-net_2_0-1</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5.csproj">
+      <Project>{68286A26-2A32-40A6-9D0D-907CA13C0455}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
+      <Project>{6C839B97-FDEE-48E9-85D1-12DAD128201D}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj
index 093645feafc..fa3724817e2 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{4A6EBF07-2A54-4451-9CC4-120E282AFA6B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_4_0</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-net_4_0</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,91 +27,92 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
-   <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
+    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -121,42 +121,40 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v4.0.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.v4.0.dll</HintPath>
-    </Reference>
-
+    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
+      <Project>{280E1B59-BAAA-4E02-99CA-8070BCB2C72E}</Project>
+      <Name>corlib\corlib-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System\System-net_4_0-2.csproj">
+      <Project>{C0648621-9C6E-4584-9CF6-70EBB2D60489}</Project>
+      <Name>System\System-net_4_0-2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">
+      <Project>{CC96F21E-C45E-4593-BC7F-8331B913E758}</Project>
+      <Name>System.Core\System.Core-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
+      <Project>{A1A09F77-428E-4B5F-9C0C-3B07F55909A6}</Project>
+      <Name>System.XML\System.Xml-net_4_0-1</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">
+      <Project>{D23CE200-FDD6-4D7A-8C0E-82A0D0706184}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">
+      <Project>{9B20519A-37B9-477A-88A1-C79F0B78B978}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj
index 44f676e6dcc..b2cc06a00eb 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{7833288D-DA51-43F8-8C02-BF5D934A4675}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-net_4_5</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,91 +27,92 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
-   <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
-   <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
-   <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
+    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />
+    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -121,42 +121,40 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v4.0.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.v4.0.dll</HintPath>
-    </Reference>
-
+    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
+      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>
+      <Name>corlib\corlib-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System\System-net_4_5-2.csproj">
+      <Project>{17388044-BE4B-4CBE-92D8-5C130414AD84}</Project>
+      <Name>System\System-net_4_5-2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
+      <Project>{BC9226DD-0D9F-4836-BA8B-87A3E6F06176}</Project>
+      <Name>System.Core\System.Core-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
+      <Project>{AB0D8551-2D53-46F2-A340-789E7B62BF57}</Project>
+      <Name>System.XML\System.Xml-net_4_5-1</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">
+      <Project>{E9A72DC4-EFC2-45F7-82F3-6AD620731241}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5.csproj">
+      <Project>{AD443ADF-77CD-40CB-87BC-1817B770C9ED}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj
index 0b2ff9b94b3..7a388bf3281 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_2_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{46AAA3A3-4B1A-40FA-A1EB-A1165C746016}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>.\</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_2_0</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>False</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine_test_net_2_0</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,52 +27,53 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
-   <Compile Include="Test\various\Build.cs" />
-   <Compile Include="Test\various\Conditions.cs" />
-   <Compile Include="Test\various\DefaultTasks.cs" />
-   <Compile Include="Test\various\EvaluationOrder.cs" />
-   <Compile Include="Test\various\Items.cs" />
-   <Compile Include="Test\various\ProjectElement.cs" />
-   <Compile Include="Test\various\Properties.cs" />
-   <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
+    <Compile Include="Test\various\Build.cs" />
+    <Compile Include="Test\various\Conditions.cs" />
+    <Compile Include="Test\various\DefaultTasks.cs" />
+    <Compile Include="Test\various\EvaluationOrder.cs" />
+    <Compile Include="Test\various\Items.cs" />
+    <Compile Include="Test\various\ProjectElement.cs" />
+    <Compile Include="Test\various\Properties.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -82,35 +82,37 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_2_0/Microsoft.Build.Engine.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_2_0/Microsoft.Build.Engine.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-
+    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />
+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>
+      <Name>corlib\corlib-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0.csproj">
+      <Project>{F9FF05AC-F1E0-4BA5-BD84-54C71B46C8B6}</Project>
+      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0.csproj">
+      <Project>{75B122DA-F2B9-4F68-A4E9-5EEF97ECBAB2}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0.csproj">
+      <Project>{C58C325B-D757-4335-97FB-75A117978082}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
+      <Project>{A892207C-64E0-4FCA-8541-A3C71099AA13}</Project>
+      <Name>System.XML\System.Xml-net_2_0-1</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj
index 86fc82a7259..0606792db9b 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_3_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{7BA8F10C-2D18-45AF-BA08-35F1B81712DB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>.\</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_3_5</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>False</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine_test_net_3_5</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,52 +27,53 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_3_5,./../../class/lib/net_2_0</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_3_5,./../../class/lib/net_2_0</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
-   <Compile Include="Test\various\Build.cs" />
-   <Compile Include="Test\various\Conditions.cs" />
-   <Compile Include="Test\various\DefaultTasks.cs" />
-   <Compile Include="Test\various\EvaluationOrder.cs" />
-   <Compile Include="Test\various\Items.cs" />
-   <Compile Include="Test\various\ProjectElement.cs" />
-   <Compile Include="Test\various\Properties.cs" />
-   <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
+    <Compile Include="Test\various\Build.cs" />
+    <Compile Include="Test\various\Conditions.cs" />
+    <Compile Include="Test\various\DefaultTasks.cs" />
+    <Compile Include="Test\various\EvaluationOrder.cs" />
+    <Compile Include="Test\various\Items.cs" />
+    <Compile Include="Test\various\ProjectElement.cs" />
+    <Compile Include="Test\various\Properties.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -82,35 +82,37 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_3_5\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_3_5/Microsoft.Build.Engine.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_3_5/Microsoft.Build.Engine.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_3_5/Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_3_5/Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v3.5.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.v3.5.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-
+    <Reference Include="..\lib\net_3_5\nunit.framework.dll" />
+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>
+      <Name>corlib\corlib-net_2_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_3_5.csproj">
+      <Project>{FDD46689-2109-4990-87C8-488E04A46008}</Project>
+      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_3_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5.csproj">
+      <Project>{68286A26-2A32-40A6-9D0D-907CA13C0455}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
+      <Project>{6C839B97-FDEE-48E9-85D1-12DAD128201D}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
+      <Project>{A892207C-64E0-4FCA-8541-A3C71099AA13}</Project>
+      <Name>System.XML\System.Xml-net_2_0-1</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj
index 5d33478e436..da538f0ccdf 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{570D80D9-369A-412C-A319-21A37B0AC3EA}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>.\</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_4_0</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>False</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine_test_net_4_0</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,52 +27,53 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
-   <Compile Include="Test\various\Build.cs" />
-   <Compile Include="Test\various\Conditions.cs" />
-   <Compile Include="Test\various\DefaultTasks.cs" />
-   <Compile Include="Test\various\EvaluationOrder.cs" />
-   <Compile Include="Test\various\Items.cs" />
-   <Compile Include="Test\various\ProjectElement.cs" />
-   <Compile Include="Test\various\Properties.cs" />
-   <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
+    <Compile Include="Test\various\Build.cs" />
+    <Compile Include="Test\various\Conditions.cs" />
+    <Compile Include="Test\various\DefaultTasks.cs" />
+    <Compile Include="Test\various\EvaluationOrder.cs" />
+    <Compile Include="Test\various\Items.cs" />
+    <Compile Include="Test\various\ProjectElement.cs" />
+    <Compile Include="Test\various\Properties.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -82,35 +82,37 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_4_0/Microsoft.Build.Engine.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/Microsoft.Build.Engine.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v4.0.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.v4.0.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-
+    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />
+    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
+      <Project>{280E1B59-BAAA-4E02-99CA-8070BCB2C72E}</Project>
+      <Name>corlib\corlib-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">
+      <Project>{4A6EBF07-2A54-4451-9CC4-120E282AFA6B}</Project>
+      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0.csproj">
+      <Project>{D23CE200-FDD6-4D7A-8C0E-82A0D0706184}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0.csproj">
+      <Project>{9B20519A-37B9-477A-88A1-C79F0B78B978}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_0</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
+      <Project>{A1A09F77-428E-4B5F-9C0C-3B07F55909A6}</Project>
+      <Name>System.XML\System.Xml-net_4_0-1</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj
index cc847329579..e3ab9c7ecc4 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{5C43873F-0A08-4B6A-86DE-2560ABF7D30B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>.\</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_4_5</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>False</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>Microsoft.Build.Engine_test_net_4_5</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,52 +27,53 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
-   <Compile Include="Test\various\Build.cs" />
-   <Compile Include="Test\various\Conditions.cs" />
-   <Compile Include="Test\various\DefaultTasks.cs" />
-   <Compile Include="Test\various\EvaluationOrder.cs" />
-   <Compile Include="Test\various\Items.cs" />
-   <Compile Include="Test\various\ProjectElement.cs" />
-   <Compile Include="Test\various\Properties.cs" />
-   <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />
+    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />
+    <Compile Include="Test\various\Build.cs" />
+    <Compile Include="Test\various\Conditions.cs" />
+    <Compile Include="Test\various\DefaultTasks.cs" />
+    <Compile Include="Test\various\EvaluationOrder.cs" />
+    <Compile Include="Test\various\Items.cs" />
+    <Compile Include="Test\various\ProjectElement.cs" />
+    <Compile Include="Test\various\Properties.cs" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -82,35 +82,37 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_4_5/Microsoft.Build.Engine.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/Microsoft.Build.Engine.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v4.0.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.Build.Utilities.v4.0.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-
+    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />
+    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
+      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>
+      <Name>corlib\corlib-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5.csproj">
+      <Project>{7833288D-DA51-43F8-8C02-BF5D934A4675}</Project>
+      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">
+      <Project>{E9A72DC4-EFC2-45F7-82F3-6AD620731241}</Project>
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5.csproj">
+      <Project>{AD443ADF-77CD-40CB-87BC-1817B770C9ED}</Project>
+      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
+      <Project>{AB0D8551-2D53-46F2-A340-789E7B62BF57}</Project>
+      <Name>System.XML\System.Xml-net_4_5-1</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>
author	Marek Safar <marek.safar@gmail.com>	2013-02-07 19:33:49 +0400
committer	Marek Safar <marek.safar@gmail.com>	2013-02-07 19:34:23 +0400
commit	78318771d52403e6b0588eb04dd8f74afa7f43f8 (patch)
tree	348729d49b56c64b5974cb5465a862cb921f734a /mcs/class/Microsoft.Build.Engine
parent	425d8ff70911438c1600912e5dfed0a0c7437491 (diff)