From cc098202468674c75d14961f92272bb84a2d173c Mon Sep 17 00:00:00 2001
From: Vincent Gromfeld <vigromfe@microsoft.com>
Date: Fri, 6 Mar 2020 15:07:54 +0100
Subject: [PATCH] Replace Task.FromResult by Task.CompletedTask

---
 Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs  | 8 ++------
 .../Deferred/TypedEventHandlerExtensions.cs               | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs b/Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs
index 62b5abcec3a..ee2b2cf5aac 100644
--- a/Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -16,8 +14,6 @@ namespace Microsoft.Toolkit.Uwp.Deferred
     /// </summary>
     public static class EventHandlerExtensions
     {
-        private static readonly Task CompletedTask = Task.FromResult(0);
-
         /// <summary>
         /// Use to invoke an async <see cref="EventHandler{TEventArgs}"/> using <see cref="DeferredEventArgs"/>.
         /// </summary>
@@ -46,7 +42,7 @@ public static Task InvokeAsync<T>(this EventHandler<T> eventHandler, object send
         {
             if (eventHandler == null)
             {
-                return CompletedTask;
+                return Task.CompletedTask;
             }
 
             var tasks = eventHandler.GetInvocationList()
@@ -59,7 +55,7 @@ public static Task InvokeAsync<T>(this EventHandler<T> eventHandler, object send
 
                     var deferral = eventArgs.GetCurrentDeferralAndReset();
 
-                    return deferral?.WaitForCompletion(cancellationToken) ?? CompletedTask;
+                    return deferral?.WaitForCompletion(cancellationToken) ?? Task.CompletedTask;
                 })
                 .ToArray();
 
diff --git a/Microsoft.Toolkit.Uwp/Deferred/TypedEventHandlerExtensions.cs b/Microsoft.Toolkit.Uwp/Deferred/TypedEventHandlerExtensions.cs
index 20a50adcd3d..9e7258e9775 100644
--- a/Microsoft.Toolkit.Uwp/Deferred/TypedEventHandlerExtensions.cs
+++ b/Microsoft.Toolkit.Uwp/Deferred/TypedEventHandlerExtensions.cs
@@ -15,8 +15,6 @@ namespace Microsoft.Toolkit.Uwp.Deferred
     /// </summary>
     public static class TypedEventHandlerExtensions
     {
-        private static readonly Task CompletedTask = Task.FromResult(0);
-
         /// <summary>
         /// Use to invoke an async <see cref="TypedEventHandler{TSender, TResult}"/> using <see cref="DeferredEventArgs"/>.
         /// </summary>
@@ -47,7 +45,7 @@ public static Task InvokeAsync<S, R>(this TypedEventHandler<S, R> eventHandler,
         {
             if (eventHandler == null)
             {
-                return CompletedTask;
+                return Task.CompletedTask;
             }
 
             var tasks = eventHandler.GetInvocationList()
@@ -60,7 +58,7 @@ public static Task InvokeAsync<S, R>(this TypedEventHandler<S, R> eventHandler,
 
                     var deferral = eventArgs.GetCurrentDeferralAndReset();
 
-                    return deferral?.WaitForCompletion(cancellationToken) ?? CompletedTask;
+                    return deferral?.WaitForCompletion(cancellationToken) ?? Task.CompletedTask;
                 })
                 .ToArray();