Imported Upstream version 5.10.0.91

Former-commit-id: 79b479e76cd93ed8fe10a2598140a56207457027
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-02-06 19:15:47 +00:00
parent 104a9a4d34
commit 738df3e2cc
61 changed files with 493 additions and 44 deletions

View File

@@ -20,7 +20,9 @@ namespace System.Threading.Tasks
/// Represents an exception used to communicate task cancellation.
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TaskCanceledException : OperationCanceledException
{
[NonSerialized]

View File

@@ -21,7 +21,9 @@ namespace System.Threading.Tasks
/// <see cref="T:System.Threading.Tasks.TaskScheduler"/>.
/// </summary>
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class TaskSchedulerException : Exception
{
/// <summary>

View File

@@ -16,7 +16,7 @@
// return TaskToApm.End<int>(asyncResult);
// }
using System.Diagnostics;
using System.Diagnostics.Private;
namespace System.Threading.Tasks
{

View File

@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
using System.Diagnostics.Private;
namespace System.Threading.Tasks
{

View File

@@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
using System.Diagnostics.Private;
using System.Runtime.CompilerServices;
using System.Runtime.ExceptionServices;