Merge branch 'master' of https://github.com/mono/mono into issue4328

[mono.git] / mcs / class / System.Threading.Tasks.Dataflow / System.Threading.Tasks.Dataflow-tests-net_4_5.csproj

diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj
index d80879f2ed1c9beb86544b617766d5aba5c64a29..078375cf7f34915dd131825373e70b6d273035e2 100644 (file)
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj
+++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
@@ -10,14 +10,16 @@
     <NoWarn>1699</NoWarn>\r
     <OutputPath>.\</OutputPath>\r
     <NoStdLib>true</NoStdLib>\r
-    \r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace></RootNamespace>\r
+    <RootNamespace>MonoTests</RootNamespace>\r
     <AssemblyName>System.Threading.Tasks.Dataflow_test_net_4_5</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
@@ -28,6 +30,7 @@
     <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <PlatformTarget>AnyCPU</PlatformTarget>  \r
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
@@ -38,10 +41,26 @@
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-   <Compile Include="Test\System.Threading.Tasks\ConcurrentExclusiveSchedulerPairTest.cs" />
+    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs">\r
+      <Link>AtomicBoolean.cs</Link>\r
+    </Compile>\r
+    <Compile Include="Test\Blocks.cs" />\r
+    <Compile Include="System.Threading.Tasks.Dataflow\CompletionHelper.cs" />\r
+    <Compile Include="Test\AssertEx.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\ChooseTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\EncapsulateTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\InvalidArgumentsTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\OutputAvailableTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\GreedyTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\PropagateCompletionTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\ReceivingTest.cs" />\r
+    <Compile Include="Test\TestScheduler.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BoundedCapacityTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\ExecutionBlocksTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchedJoinBlockTest.cs" />\r
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchedJoinBlock`3Test.cs" />\r
    <Compile Include="Test\System.Threading.Tasks.Dataflow\DataflowMessageHeaderTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\CompletionHelperTest.cs" />
-   <Compile Include="System.Threading.Tasks.Dataflow\CompletionHelper.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\ActionBlockTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchBlockTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\BroadcastBlockTest.cs" />
@@ -50,10 +69,10 @@
    <Compile Include="Test\System.Threading.Tasks.Dataflow\DataflowBlockTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\JoinBlockTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\JoinBlock`3Test.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\OptionsTest.cs" />\r
    <Compile Include="Test\System.Threading.Tasks.Dataflow\TransformBlockTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\TransformManyBlockTest.cs" />
    <Compile Include="Test\System.Threading.Tasks.Dataflow\WriteOnceBlockTest.cs" />
-\r
   </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
@@ -63,10 +82,11 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent></PreBuildEvent>\r
+    <PreBuildEvent>\r
+    </PreBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-        <Reference Include="mscorlib.dll">
+    <Reference Include="mscorlib.dll">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>mscorlib.dll</HintPath>
     </Reference>
@@ -74,12 +94,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>./../../class/lib/net_4_5/System.Threading.Tasks.Dataflow.dll</HintPath>
     </Reference>
+    <Reference Include="System" />\r
+    <Reference Include="System.Core.dll">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>System.Core.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework" />
-\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-  \r
-</Project>\r
-
+</Project>