Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -5,6 +5,8 @@
<ProjectGuid>{B6C09633-D161-499A-8FE1-46B2D53A16E7}</ProjectGuid>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
@ -31,6 +33,7 @@
<Compile Include="Task\TaskContinueWhenAllTests.cs" />
<Compile Include="Task\TaskFromAsyncWork.cs" />
<Compile Include="Task\TaskFromAsyncTest.cs" />
<Compile Include="Task\TaskFromAsyncTest2.cs" />
<Compile Include="Task\TaskCancelWaitTests.cs" />
<Compile Include="Task\TaskCancelWaitTest.cs" />
<Compile Include="Task\TaskRtTests.cs" />
@ -48,9 +51,10 @@
<Compile Include="$(CommonTestPath)\System\Threading\ThreadPoolHelpers.cs">
<Link>CommonTest\System\Threading\ThreadPoolHelpers.cs</Link>
</Compile>
<Compile Include="Task\TaskDisposeTests.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="Task\TaskDisposeTests.netstandard.cs" />
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<Compile Include="Task\TaskStatusTest.netcoreapp.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>