diff --git a/sdk/core/Azure.Core/src/Shared/TaskExtensions.cs b/sdk/core/Azure.Core/src/Shared/TaskExtensions.cs index 61b215054ec0..a22738192f8b 100644 --- a/sdk/core/Azure.Core/src/Shared/TaskExtensions.cs +++ b/sdk/core/Azure.Core/src/Shared/TaskExtensions.cs @@ -25,11 +25,6 @@ public static T EnsureCompleted(this Task task) { #if DEBUG VerifyTaskCompleted(task.IsCompleted); -#else - if (HasSynchronizationContext()) - { - throw new InvalidOperationException("Synchronously waiting on non-completed task isn't allowed."); - } #endif #pragma warning disable AZC0102 // Do not use GetAwaiter().GetResult(). Use the TaskExtensions.EnsureCompleted() extension method instead. return task.GetAwaiter().GetResult(); @@ -40,11 +35,6 @@ public static void EnsureCompleted(this Task task) { #if DEBUG VerifyTaskCompleted(task.IsCompleted); -#else - if (HasSynchronizationContext()) - { - throw new InvalidOperationException("Synchronously waiting on non-completed task isn't allowed."); - } #endif #pragma warning disable AZC0102 // Do not use GetAwaiter().GetResult(). Use the TaskExtensions.EnsureCompleted() extension method instead. task.GetAwaiter().GetResult(); @@ -53,12 +43,9 @@ public static void EnsureCompleted(this Task task) public static T EnsureCompleted(this ValueTask task) { - if (!task.IsCompleted) - { -#pragma warning disable AZC0107 // public asynchronous method shouldn't be called in synchronous scope. Use synchronous version of the method if it is available. - return EnsureCompleted(task.AsTask()); -#pragma warning restore AZC0107 // public asynchronous method shouldn't be called in synchronous scope. Use synchronous version of the method if it is available. - } +#if DEBUG + VerifyTaskCompleted(task.IsCompleted); +#endif #pragma warning disable AZC0102 // Do not use GetAwaiter().GetResult(). Use the TaskExtensions.EnsureCompleted() extension method instead. return task.GetAwaiter().GetResult(); #pragma warning restore AZC0102 // Do not use GetAwaiter().GetResult(). Use the TaskExtensions.EnsureCompleted() extension method instead. @@ -66,18 +53,12 @@ public static T EnsureCompleted(this ValueTask task) public static void EnsureCompleted(this ValueTask task) { - if (!task.IsCompleted) - { -#pragma warning disable AZC0107 // public asynchronous method shouldn't be called in synchronous scope. Use synchronous version of the method if it is available. - EnsureCompleted(task.AsTask()); -#pragma warning restore AZC0107 // public asynchronous method shouldn't be called in synchronous scope. Use synchronous version of the method if it is available. - } - else - { +#if DEBUG + VerifyTaskCompleted(task.IsCompleted); +#endif #pragma warning disable AZC0102 // Do not use GetAwaiter().GetResult(). Use the TaskExtensions.EnsureCompleted() extension method instead. - task.GetAwaiter().GetResult(); + task.GetAwaiter().GetResult(); #pragma warning restore AZC0102 // Do not use GetAwaiter().GetResult(). Use the TaskExtensions.EnsureCompleted() extension method instead. - } } public static Enumerable EnsureSyncEnumerable(this IAsyncEnumerable asyncEnumerable) => new Enumerable(asyncEnumerable); @@ -120,9 +101,6 @@ private static void VerifyTaskCompleted(bool isCompleted) } } - private static bool HasSynchronizationContext() - => SynchronizationContext.Current != null && SynchronizationContext.Current.GetType() != typeof(SynchronizationContext) || TaskScheduler.Current != TaskScheduler.Default; - /// /// Both and are defined as public structs so that foreach can use duck typing /// to call and avoid heap memory allocation. diff --git a/sdk/core/Azure.Core/tests/TaskExtensionsTest.cs b/sdk/core/Azure.Core/tests/TaskExtensionsTest.cs index 9fe2dd399949..4ce2839ef361 100644 --- a/sdk/core/Azure.Core/tests/TaskExtensionsTest.cs +++ b/sdk/core/Azure.Core/tests/TaskExtensionsTest.cs @@ -4,7 +4,6 @@ using Azure.Core.Pipeline; using NUnit.Framework; using System; -using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; @@ -12,136 +11,6 @@ namespace Azure.Core.Tests { public class TaskExtensionsTest { - [Test] - public void TaskExtensions_TaskEnsureCompleted() - { - var task = Task.CompletedTask; - task.EnsureCompleted(); - } - - [Test] - public void TaskExtensions_TaskOfTEnsureCompleted() - { - var task = Task.FromResult(42); - Assert.AreEqual(42, task.EnsureCompleted()); - } - - [Test] - public void TaskExtensions_ValueTaskEnsureCompleted() - { - var task = new ValueTask(); - task.EnsureCompleted(); - } - - [Test] - public void TaskExtensions_ValueTaskOfTEnsureCompleted() - { - var task = new ValueTask(42); - Assert.AreEqual(42, task.EnsureCompleted()); - } - - [Test] - public async Task TaskExtensions_TaskEnsureCompleted_NotCompletedNoSyncContext() - { - var tcs = new TaskCompletionSource(); - Task task = tcs.Task; -#if DEBUG - Assert.Catch(() => task.EnsureCompleted()); - await Task.CompletedTask; -#else - Task runningTask = Task.Run(() => task.EnsureCompleted()); - Assert.IsFalse(runningTask.IsCompleted); - tcs.SetResult(0); - await runningTask; -#endif - } - - [Test] - public async Task TaskExtensions_TaskOfTEnsureCompleted_NotCompletedNoSyncContext() - { - var tcs = new TaskCompletionSource(); -#if DEBUG - Assert.Catch(() => tcs.Task.EnsureCompleted()); - await Task.CompletedTask; -#else - Task runningTask = Task.Run(() => tcs.Task.EnsureCompleted()); - Assert.IsFalse(runningTask.IsCompleted); - tcs.SetResult(42); - Assert.AreEqual(42, await runningTask); -#endif - } - - [Test] - public async Task TaskExtensions_ValueTaskEnsureCompleted_NotCompletedNoSyncContext() - { - var tcs = new TaskCompletionSource(); - ValueTask task = new ValueTask(tcs.Task); -#if DEBUG - Assert.Catch(() => task.EnsureCompleted()); - await Task.CompletedTask; -#else - Task runningTask = Task.Run(() => task.EnsureCompleted()); - Assert.IsFalse(runningTask.IsCompleted); - tcs.SetResult(0); - await runningTask; -#endif - } - - [Test] - public async Task TaskExtensions_ValueTaskOfTEnsureCompleted_NotCompletedNoSyncContext() - { - var tcs = new TaskCompletionSource(); - ValueTask task = new ValueTask(tcs.Task); -#if DEBUG - Assert.Catch(() => task.EnsureCompleted()); - await Task.CompletedTask; -#else - Task runningTask = Task.Run(() => task.EnsureCompleted()); - Assert.IsFalse(runningTask.IsCompleted); - tcs.SetResult(42); - Assert.AreEqual(42, await runningTask); -#endif - } - - [Test] - public void TaskExtensions_TaskEnsureCompleted_NotCompletedInSyncContext() - { - using SingleThreadedSynchronizationContext syncContext = new SingleThreadedSynchronizationContext(); - var tcs = new TaskCompletionSource(); - Task task = tcs.Task; - - syncContext.Post(t => { Assert.Catch(() => task.EnsureCompleted()); }, null); - } - - [Test] - public void TaskExtensions_TaskOfTEnsureCompleted_NotCompletedInSyncContext() - { - using SingleThreadedSynchronizationContext syncContext = new SingleThreadedSynchronizationContext(); - var tcs = new TaskCompletionSource(); - - syncContext.Post(t => { Assert.Catch(() => tcs.Task.EnsureCompleted()); }, null); - } - - [Test] - public void TaskExtensions_ValueTaskEnsureCompleted_NotCompletedInSyncContext() - { - using SingleThreadedSynchronizationContext syncContext = new SingleThreadedSynchronizationContext(); - var tcs = new TaskCompletionSource(); - ValueTask task = new ValueTask(tcs.Task); - - syncContext.Post(t => { Assert.Catch(() => task.EnsureCompleted()); }, null); - } - - [Test] - public void TaskExtensions_ValueTaskOfTEnsureCompleted_NotCompletedInSyncContext() - { - using SingleThreadedSynchronizationContext syncContext = new SingleThreadedSynchronizationContext(); - var tcs = new TaskCompletionSource(); - var task = new ValueTask(tcs.Task); - - syncContext.Post(t => { Assert.Catch(() => task.EnsureCompleted()); }, null); - } - [Test] public void TaskExtensions_TaskWithCancellationDefault() { @@ -323,55 +192,5 @@ public void TaskExtensions_ValueTaskWithCancellationFailedAfterContinuationSched Assert.AreEqual(true, awaiter.IsCompleted); Assert.Catch(() => awaiter.GetResult(), "Error"); } - - private sealed class SingleThreadedSynchronizationContext : SynchronizationContext, IDisposable - { - private readonly Task _task; - private readonly BlockingCollection _queue; - private readonly ConcurrentQueue _exceptions; - - public SingleThreadedSynchronizationContext() - { - _queue = new BlockingCollection(); - _exceptions = new ConcurrentQueue(); - _task = Task.Run(RunLoop); - } - - private void RunLoop() - { - try - { - SetSynchronizationContext(this); - while (!_queue.IsCompleted) - { - Action action = _queue.Take(); - try - { - action(); - } - catch (Exception e) - { - _exceptions.Enqueue(e); - } - } - } - catch (InvalidOperationException) { } - catch (OperationCanceledException) { } - finally - { - SetSynchronizationContext(null); - } - } - - public override void Post(SendOrPostCallback d, object state) => _queue.Add(() => d(state)); - - public void Dispose() - { - _queue.CompleteAdding(); - _task.Wait(); - } - - public AggregateException Exceptions => new AggregateException(_exceptions); - } } } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md b/sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md index abcd4b9865d0..6a6f3d61b4e9 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md @@ -1,5 +1,10 @@ # Release History +## 7.0.0-preview.6 (2020-08-18) + +### Fixed +- Bug in TaskExtensions.EnsureCompleted method that causes it to unconditionally throw an exception in the environments with synchronization context + ## 7.0.0-preview.5 (2020-08-11) ### Acknowledgements diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj index df4b96d617cb..81167cb5e7fc 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj @@ -1,7 +1,7 @@ Azure Service Bus is a fully managed enterprise integration message broker. Service Bus can decouple applications and services. Service Bus offers a reliable and secure platform for asynchronous transfer of data and state. This client library allows for both sending and receiving messages using Azure Service Bus. For more information about Service Bus, see https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview - 7.0.0-preview.5 + 7.0.0-preview.6 Azure;Service Bus;ServiceBus;.NET;AMQP;$(PackageCommonTags) $(RequiredTargetFrameworks)