Update csproj files

4 files changed, 172 insertions, 172 deletions

diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_0.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_0.csproj
index e991196edd6..0320197dd98 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_0.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-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>{A5A14180-91C5-4A8B-9DBA-3D65A62A2F52}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>./../../class/lib/net_4_0</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Parallel-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Parallel</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,39 +27,40 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;INSIDE_MONO_PARALLEL</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;INSIDE_MONO_PARALLEL</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\Locale.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />
-   <Compile Include="Mono.Threading\CSnzi.cs" />
-   <Compile Include="Mono.Threading\Snzi.cs" />
-   <Compile Include="Mono.Threading\SpinLockWrapper.cs" />
-   <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />
-   <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />
-   <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />
-   <Compile Include="Mono.Threading.Tasks\ThreadWorker.cs" />
-   <Compile Include="Mono.Threading.Tasks\MonoTaskExtensions.cs" />
-   <Compile Include="Mono.Threading.Tasks\MonoTaskScheduler.cs" />
-   <Compile Include="Mono.Threading.Tasks\FixedTaskScheduler.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

+    <Compile Include="..\..\build\common\Locale.cs" />

+    <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />

+    <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />

+    <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />

+    <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />

+    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />

+    <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />

+    <Compile Include="Mono.Threading.Tasks\FixedTaskScheduler.cs" />

+    <Compile Include="Mono.Threading.Tasks\MonoTaskExtensions.cs" />

+    <Compile Include="Mono.Threading.Tasks\MonoTaskScheduler.cs" />

+    <Compile Include="Mono.Threading.Tasks\ThreadWorker.cs" />

+    <Compile Include="Mono.Threading\CSnzi.cs" />

+    <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />

+    <Compile Include="Mono.Threading\Snzi.cs" />

+    <Compile Include="Mono.Threading\SpinLockWrapper.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">

@@ -69,30 +69,28 @@
   </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.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.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.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\System-net_4_0-2.csproj">

+      <Project>{C0648621-9C6E-4584-9CF6-70EBB2D60489}</Project>

+      <Name>System\System-net_4_0-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
index e959be217a5..90e3b483f62 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-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>{686B27E2-8342-424A-95AE-85AA0D33CA10}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>./../../class/lib/net_4_5</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Parallel-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Parallel</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,39 +27,40 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_MONO_PARALLEL</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;INSIDE_MONO_PARALLEL</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\Locale.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />
-   <Compile Include="Mono.Threading\CSnzi.cs" />
-   <Compile Include="Mono.Threading\Snzi.cs" />
-   <Compile Include="Mono.Threading\SpinLockWrapper.cs" />
-   <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />
-   <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />
-   <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />
-   <Compile Include="Mono.Threading.Tasks\ThreadWorker.cs" />
-   <Compile Include="Mono.Threading.Tasks\MonoTaskExtensions.cs" />
-   <Compile Include="Mono.Threading.Tasks\MonoTaskScheduler.cs" />
-   <Compile Include="Mono.Threading.Tasks\FixedTaskScheduler.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

+    <Compile Include="..\..\build\common\Locale.cs" />

+    <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />

+    <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />

+    <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />

+    <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />

+    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />

+    <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />

+    <Compile Include="Mono.Threading.Tasks\FixedTaskScheduler.cs" />

+    <Compile Include="Mono.Threading.Tasks\MonoTaskExtensions.cs" />

+    <Compile Include="Mono.Threading.Tasks\MonoTaskScheduler.cs" />

+    <Compile Include="Mono.Threading.Tasks\ThreadWorker.cs" />

+    <Compile Include="Mono.Threading\CSnzi.cs" />

+    <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />

+    <Compile Include="Mono.Threading\Snzi.cs" />

+    <Compile Include="Mono.Threading\SpinLockWrapper.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">

@@ -69,30 +69,28 @@
   </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.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.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.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\System-net_4_5-2.csproj">

+      <Project>{17388044-BE4B-4CBE-92D8-5C130414AD84}</Project>

+      <Name>System\System-net_4_5-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_0.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_0.csproj
index d969c08c024..d7b7f10b094 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_0.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-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>{77DA77E8-1D44-47D9-B6A6-A10831F9CD66}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Parallel-tests-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Parallel_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,28 +27,29 @@
     <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\Mono.Collections.Concurrent\CollectionStressTestHelper.cs" />
-   <Compile Include="Test\Mono.Collections.Concurrent\ConcurrentSkipListTests.cs" />
-   <Compile Include="Test\Mono.Threading\ParallelTestHelper.cs" />
-   <Compile Include="Test\Mono.Threading\SnziTests.cs" />
-   <Compile Include="Test\Mono.Threading.Tasks\MonoTaskExtensionsTests.cs" />
-   <Compile Include="Test\Mono.Threading.Tasks\MonoTaskSchedulerTests.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\Mono.Collections.Concurrent\CollectionStressTestHelper.cs" />

+    <Compile Include="Test\Mono.Collections.Concurrent\ConcurrentSkipListTests.cs" />

+    <Compile Include="Test\Mono.Threading.Tasks\MonoTaskExtensionsTests.cs" />

+    <Compile Include="Test\Mono.Threading.Tasks\MonoTaskSchedulerTests.cs" />

+    <Compile Include="Test\Mono.Threading\ParallelTestHelper.cs" />

+    <Compile Include="Test\Mono.Threading\SnziTests.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">

@@ -58,27 +58,29 @@
   </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/Mono.Parallel.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/Mono.Parallel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.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="..\Mono.Parallel\Mono.Parallel-net_4_0.csproj">

+      <Project>{A5A14180-91C5-4A8B-9DBA-3D65A62A2F52}</Project>

+      <Name>Mono.Parallel\Mono.Parallel-net_4_0</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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_5.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_5.csproj
index 387b3668b6c..f7d4b85020e 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_5.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-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>{AF65461E-E29A-4503-AE9F-6243F078C0BF}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Parallel-tests-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Parallel_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,28 +27,29 @@
     <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\Mono.Collections.Concurrent\CollectionStressTestHelper.cs" />
-   <Compile Include="Test\Mono.Collections.Concurrent\ConcurrentSkipListTests.cs" />
-   <Compile Include="Test\Mono.Threading\ParallelTestHelper.cs" />
-   <Compile Include="Test\Mono.Threading\SnziTests.cs" />
-   <Compile Include="Test\Mono.Threading.Tasks\MonoTaskExtensionsTests.cs" />
-   <Compile Include="Test\Mono.Threading.Tasks\MonoTaskSchedulerTests.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\Mono.Collections.Concurrent\CollectionStressTestHelper.cs" />

+    <Compile Include="Test\Mono.Collections.Concurrent\ConcurrentSkipListTests.cs" />

+    <Compile Include="Test\Mono.Threading.Tasks\MonoTaskExtensionsTests.cs" />

+    <Compile Include="Test\Mono.Threading.Tasks\MonoTaskSchedulerTests.cs" />

+    <Compile Include="Test\Mono.Threading\ParallelTestHelper.cs" />

+    <Compile Include="Test\Mono.Threading\SnziTests.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">

@@ -58,27 +58,29 @@
   </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/Mono.Parallel.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/Mono.Parallel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.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="..\Mono.Parallel\Mono.Parallel-net_4_5.csproj">

+      <Project>{686B27E2-8342-424A-95AE-85AA0D33CA10}</Project>

+      <Name>Mono.Parallel\Mono.Parallel-net_4_5</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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>