Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit e7eeb95

Browse files
committed
Add TaskExtensions.Unwrap tests
This commit provides a System.Threading.Tasks.Tests project that doesn't include all of the tests that @mellinoe is porting. However, it does include a new set of tests written from scratch for TaskExtensions.Unwrap, which is the portion of System.Threading.Tasks whose source lives in corefx rather than in coreclr. They are meant to be the primary unit testing for Unwrap, as the existing tests only superficially exercise the functionality.
1 parent 211499a commit e7eeb95

File tree

5 files changed

+1326
-2
lines changed

5 files changed

+1326
-2
lines changed

src/System.Threading.Tasks/System.Threading.Tasks.sln

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.22823.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.CoreCLR", "src\System.Threading.Tasks.CoreCLR.csproj", "{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}"
77
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Tests", "tests\System.Threading.Tasks.Tests.csproj", "{B6C09633-D161-499A-8FE1-46B2D53A16E7}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
1517
{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
1618
{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
1719
{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.Build.0 = Release|Any CPU
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<OutputType>Library</OutputType>
8+
<AssemblyName>System.Threading.Tasks.Tests</AssemblyName>
9+
<ProjectGuid>{B6C09633-D161-499A-8FE1-46B2D53A16E7}</ProjectGuid>
10+
</PropertyGroup>
11+
<!-- Default configurations to help VS understand the configurations -->
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
14+
<ItemGroup>
15+
<Compile Include="UnwrapTests.cs" />
16+
</ItemGroup>
17+
<ItemGroup>
18+
<None Include="project.json" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing -->
22+
<ProjectReference Include="..\src\System.Threading.Tasks.CoreCLR.csproj">
23+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
24+
<OutputItemType>Content</OutputItemType>
25+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
27+
</ProjectReference>
28+
</ItemGroup>
29+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
30+
</Project>

0 commit comments

Comments
 (0)