X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Threading.Tasks.Dataflow%2FSystem.Threading.Tasks.Dataflow-tests-net_4_5.csproj;h=3443c94eeba7dec5142bfda22fb74d626177aaa2;hb=dd5e72a46ff2fb187db84c1392692b0523008b60;hp=d80879f2ed1c9beb86544b617766d5aba5c64a29;hpb=e7951e6ee0786855af92d677d5fb20fe14f5ecdf;p=mono.git

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 d80879f2ed1..3443c94eeba 100644
--- 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
@@ -5,14 +5,16 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{F87B162C-A83C-45FD-8FED-FFFB1E4C002C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>.\</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\System.Threading.Tasks.Dataflow-tests-net_4_5</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>False</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>System.Threading.Tasks.Dataflow_test_net_4_5</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -25,7 +27,6 @@
     <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' ">
     <DebugType>pdbonly</DebugType>
@@ -34,27 +35,45 @@
     <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\System.Threading.Tasks\ConcurrentExclusiveSchedulerPairTest.cs" />
-   <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" />
-   <Compile Include="Test\System.Threading.Tasks.Dataflow\BufferBlockTest.cs" />
-   <Compile Include="Test\System.Threading.Tasks.Dataflow\CompletionTest.cs" />
-   <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\TransformBlockTest.cs" />
-   <Compile Include="Test\System.Threading.Tasks.Dataflow\TransformManyBlockTest.cs" />
-   <Compile Include="Test\System.Threading.Tasks.Dataflow\WriteOnceBlockTest.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />
+    <Compile Include="System.Threading.Tasks.Dataflow\CompletionHelper.cs" />
+    <Compile Include="Test\AssertEx.cs" />
+    <Compile Include="Test\Blocks.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\BatchedJoinBlock`3Test.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchedJoinBlockTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BoundedCapacityTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BroadcastBlockTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\BufferBlockTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\ChooseTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\CompletionHelperTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\CompletionTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\DataflowBlockTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\DataflowMessageHeaderTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\EncapsulateTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\ExecutionBlocksTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\GreedyTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\InvalidArgumentsTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\JoinBlock`3Test.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\JoinBlockTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\OptionsTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\OutputAvailableTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\PropagateCompletionTest.cs" />
+    <Compile Include="Test\System.Threading.Tasks.Dataflow\ReceivingTest.cs" />
+    <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" />
+    <Compile Include="Test\TestScheduler.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">
@@ -63,23 +82,33 @@
   </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/System.Threading.Tasks.Dataflow.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/System.Threading.Tasks.Dataflow.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>{05A7A0C2-6946-4CF5-9ED3-44AB0B428C4E}</Project>
+      <Name>corlib\corlib-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Threading.Tasks.Dataflow\System.Threading.Tasks.Dataflow-net_4_5.csproj">
+      <Project>{D7EDCA7E-F61D-4D8A-8540-B0DDAED8A927}</Project>
+      <Name>System.Threading.Tasks.Dataflow\System.Threading.Tasks.Dataflow-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
+      <Project>{E77D8877-AEAD-4FDF-8A44-36AAA0B20653}</Project>
+      <Name>System.Core\System.Core-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System\System-net_4_5-2.csproj">
+      <Project>{34966210-D64D-419C-94A4-9A6093CE5882}</Project>
+      <Name>System\System-net_4_5-2</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>