Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions

View File

@ -36,7 +36,6 @@ namespace System.Threading.Tasks.Tests
}
[SecurityCritical]
protected override void QueueTask(Task task)
{
if (task == null) throw new ArgumentNullException("When requesting to QueueTask, the input task can not be null");
@ -52,13 +51,11 @@ namespace System.Threading.Tasks.Tests
}, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default);
}
[SecuritySafeCritical] //This has to be SecuritySafeCritical since its accesses TaskScheduler.TryExecuteTask (which is safecritical)
private void ExecuteTask(Task task)
{
base.TryExecuteTask(task);
}
[SecurityCritical]
protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
{
if (taskWasPreviouslyQueued) return false;
@ -72,7 +69,6 @@ namespace System.Threading.Tasks.Tests
// set;
//}
[SecurityCritical]
protected override IEnumerable<Task> GetScheduledTasks() { return null; }
private Object _lockObj = new Object();
private int _counter = 1; //This is used to keep track of how many scheduler tasks were created

View File

@ -4,7 +4,6 @@
<PropertyGroup>
<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'" />
@ -58,4 +57,4 @@
<Compile Include="Task\TaskStatusTest.netcoreapp.cs" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>

View File

@ -89,13 +89,11 @@ namespace System.Threading.Tasks.Tests
}
}
[SecuritySafeCritical]
private bool ExecuteTask(Task task)
{
return TryExecuteTask(task);
}
[SecurityCritical]
protected override void QueueTask(Task task)
{
_tasks.Add(task);
@ -109,7 +107,6 @@ namespace System.Threading.Tasks.Tests
}
}
[SecurityCritical]
protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
{
RunSyncCalledCount++;
@ -128,7 +125,6 @@ namespace System.Threading.Tasks.Tests
}
}
[SecurityCritical]
protected override IEnumerable<Task> GetScheduledTasks()
{
return _tasks;

View File

@ -339,13 +339,11 @@ namespace System.Threading.Tasks.Tests
// Buggy task scheduler to make sure that we handle QueueTask()/TryExecuteTaskInline()
// exceptions correctly. Used in RunBuggySchedulerTests() below.
[SecuritySafeCritical]
public class BuggyTaskScheduler : TaskScheduler
{
private readonly ConcurrentQueue<Task> _tasks = new ConcurrentQueue<Task>();
private bool _faultQueues;
[SecurityCritical]
protected override void QueueTask(Task task)
{
if (_faultQueues)
@ -354,13 +352,11 @@ namespace System.Threading.Tasks.Tests
_tasks.Enqueue(task);
}
[SecurityCritical]
protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
{
throw new ArgumentException("I am your worst nightmare!");
}
[SecurityCritical]
protected override IEnumerable<Task> GetScheduledTasks()
{
return _tasks;