You've already forked linux-packaging-mono
Imported Upstream version 5.10.0.91
Former-commit-id: 79b479e76cd93ed8fe10a2598140a56207457027
This commit is contained in:
parent
104a9a4d34
commit
738df3e2cc
@@ -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]
|
||||
|
@@ -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>
|
||||
|
@@ -16,7 +16,7 @@
|
||||
// return TaskToApm.End<int>(asyncResult);
|
||||
// }
|
||||
|
||||
using System.Diagnostics;
|
||||
using System.Diagnostics.Private;
|
||||
|
||||
namespace System.Threading.Tasks
|
||||
{
|
||||
|
@@ -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
|
||||
{
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -392,7 +392,7 @@ namespace System.Data.SqlClient.SNI
|
||||
/// </summary>
|
||||
public override void DisableSsl()
|
||||
{
|
||||
#if !MONO || MONO_FEATURE_BTLS || MONO_FEATURE_APPLETLS
|
||||
#if !MONO || MONO_FEATURE_BTLS || ONLY_APPLETLS
|
||||
// SSLStream.Dispose causes an unexpected behavior with legacy ssl implementation
|
||||
_sslStream.Dispose();
|
||||
#endif
|
||||
|
@@ -1 +1 @@
|
||||
38e0b56f769c5af73557977145de437792eed731
|
||||
eb3ea56a8b8a9c2c2fab5ba555b0ac2aa412b00b
|
@@ -31,6 +31,7 @@ using System.Collections.Concurrent;
|
||||
#endif
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Diagnostics.Private;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace System.Threading.Tasks
|
||||
|
@@ -1 +1 @@
|
||||
671122ad9b0b9cf5402090153b5999e24d96ea14
|
||||
d38d3be91c131cc64ac5b985b3611c4307c4d453
|
@@ -10,6 +10,7 @@
|
||||
// =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
|
||||
|
||||
using System.Diagnostics;
|
||||
using System.Diagnostics.Private;
|
||||
|
||||
// Prevents compiler warnings/errors regarding the use of ref params in Interlocked methods
|
||||
|
||||
|
@@ -8,7 +8,7 @@
|
||||
//
|
||||
// =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
|
||||
|
||||
using System.Diagnostics;
|
||||
using System.Diagnostics.Private;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
#pragma warning disable 0420
|
||||
|
Reference in New Issue
Block a user