Fix CA2008;CA2012;CA2016;CA1835;CA2208; (#2139)

* Fix CA2008;CA2012;CA2016;CA1835;CA2208;

* Resolve comments and fix tests

Author: vicancy

Directory.Build.props

@@ -29,7 +29,7 @@
     <ThirdPartyAssemblySigningCertName>3PartySHA2</ThirdPartyAssemblySigningCertName>
     <PackageSigningCertName>NuGet</PackageSigningCertName>
     <!-- Disable the warnings for now, enable batch by batch later-->
-    <NoWarn>$(NoWarn);CA2007;CA2008;CA2012;CA2016;CA1835;CA2208;IDE0161;IDE0130;IDE0290;IDE1006;IDE0090</NoWarn>
+    <NoWarn>$(NoWarn);CA2007;IDE0161;IDE0130;IDE0290;IDE1006;IDE0090</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

samples/AspNet.ChatSample/AspNet.ChatSample.CSharpClient/Program.cs

@@ -17,7 +17,7 @@ sealed class Program
     static async Task Main(string[] args)
     {
         var url = "http://localhost:8009";
-        var proxy = await ConnectAsync(url, Console.Out);
+        var proxy = await ConnectAsync(url, Console.Out).ConfigureAwait(false);
         var currentUser = Guid.NewGuid().ToString("N");
 
         Mode mode = Mode.Broadcast;
@@ -33,11 +33,11 @@ static async Task Main(string[] args)
             switch (mode)
             {
                 case Mode.Broadcast:
-                    await proxy.Invoke("BroadcastMessage", currentUser, input);
+                    await proxy.Invoke("BroadcastMessage", currentUser, input).ConfigureAwait(false);
 
                     break;
                 case Mode.Echo:
-                    await proxy.Invoke("echo", input);
+                    await proxy.Invoke("echo", input).ConfigureAwait(false);
                     break;
                 default:
                     break;
@@ -71,15 +71,15 @@ private static async Task<IHubProxy> ConnectAsync(string url, TextWriter output,
         hubProxy.On<string, string>("BroadcastMessage", BroadcastMessage);
         hubProxy.On<string>("Echo", Echo);
 
-        await StartAsyncWithAlwaysRetry(connection, output, cancellationToken: cancellationToken);
+        await StartAsyncWithAlwaysRetry(connection, output, cancellationToken: cancellationToken).ConfigureAwait(false);
 
         return hubProxy;
     }
 
     private static async Task StartAsyncWithAlwaysRetry(HubConnection connection, TextWriter output, Task startDelay = null, CancellationToken cancellationToken = default)
     {
         // When there is already a reconnect, directly return;
-        if (!ReconnectLock.Wait(0))
+        if (!ReconnectLock.Wait(0, CancellationToken.None))
         {
             return;
         }
@@ -88,21 +88,21 @@ private static async Task StartAsyncWithAlwaysRetry(HubConnection connection, Te
         {
             if (startDelay != null)
             {
-                await startDelay;
+                await startDelay.ConfigureAwait(false);
             }
 
             while (!cancellationToken.IsCancellationRequested)
             {
                 try
                 {
                     // Sometimes Start throws and triggers Error event, however sometimes not.
-                    await connection.Start();
+                    await connection.Start().ConfigureAwait(false);
                     return;
                 }
                 catch (Exception e)
                 {
                     output.WriteLine($"Error starting: {e.Message}, retry...");
-                    await ReconnectDelayTask();
+                    await ReconnectDelayTask().ConfigureAwait(false);
                 }
             }
         }

samples/ChatSample/ChatSample.CSharpClient/Program.cs

@@ -16,7 +16,7 @@ sealed class Program
         static async Task Main(string[] args)
         {
             var url = "http://localhost:5050";
-            var proxy = await ConnectAsync(url + "/chat", Console.Out);
+            var proxy = await ConnectAsync(url + "/chat", Console.Out).ConfigureAwait(false);
             var currentUser = Guid.NewGuid().ToString("N");
 
             Mode mode = Mode.Broadcast;
@@ -32,10 +32,10 @@ static async Task Main(string[] args)
                 switch (mode)
                 {
                     case Mode.Broadcast:
-                        await proxy.InvokeAsync("BroadcastMessage", currentUser, input);
+                        await proxy.InvokeAsync("BroadcastMessage", currentUser, input).ConfigureAwait(false);
                         break;
                     case Mode.Echo:
-                        await proxy.InvokeAsync("echo", input);
+                        await proxy.InvokeAsync("echo", input).ConfigureAwait(false);
                         break;
                     default:
                         break;
@@ -55,7 +55,7 @@ private static async Task<HubConnection> ConnectAsync(string url, TextWriter out
             connection.On<string, string>("BroadcastMessage", BroadcastMessage);
             connection.On<string>("Echo", Echo);
 
-            await StartAsyncWithRetry(connection, output, cancellationToken);
+            await StartAsyncWithRetry(connection, output, cancellationToken).ConfigureAwait(false);
 
             return connection;
         }
@@ -66,13 +66,13 @@ private static async Task StartAsyncWithRetry(HubConnection connection, TextWrit
             {
                 try
                 {
-                    await connection.StartAsync(cancellationToken);
+                    await connection.StartAsync(cancellationToken).ConfigureAwait(false);
                     return;
                 }
                 catch (Exception e)
                 {
                     output.WriteLine($"Error starting: {e.Message}, retry...");
-                    await Task.Delay(GetRandomDelayMilliseconds());
+                    await Task.Delay(GetRandomDelayMilliseconds(), cancellationToken).ConfigureAwait(false);
                 }
             }
         }

samples/ChatSample/ChatSample.ManagementPublisher/MessagePublisher.cs

@@ -30,7 +30,7 @@ public Task SendMessages(string command, string? receiver, string message)
         {
             if (_hubContext == null)
             {
-                throw new ArgumentNullException(nameof(_hubContext));
+                throw new ArgumentException("Call InitAsync to create HubContext first.");
             }
             switch (command)
             {
@@ -52,7 +52,7 @@ public Task CloseConnection(string connectionId, string reason)
         {
             if (_hubContext == null)
             {
-                throw new ArgumentNullException(nameof(_hubContext));
+                throw new ArgumentException("Call InitAsync to create HubContext first.");
             }
             return _hubContext.ClientManager.CloseConnectionAsync(connectionId, reason);
         }
@@ -61,7 +61,7 @@ public Task<bool> CheckExist(string type, string id)
         {
             if (_hubContext == null)
             {
-                throw new ArgumentNullException(nameof(_hubContext));
+                throw new ArgumentException("Call InitAsync to create HubContext first.");
             }
             return type switch
             {

samples/ChatSample/ChatSample.Net60/StreamingService.cs

@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-
 using ChatSample.Net60.Hubs;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
 
 namespace ChatSample.Net60
 {
@@ -17,9 +15,10 @@ public StreamingService(IHubContext<ChatHub> hubContext, ILogger<StreamingServic
             _hubContext = hubContext;
             _logger = logger;
         }
+
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            return Task.Factory.StartNew(() => StreamingTask(cancellationToken), TaskCreationOptions.LongRunning);
+            return Task.Factory.StartNew(() => StreamingTask(cancellationToken), cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Default);
         }
 
         public Task StopAsync(CancellationToken cancellationToken)
@@ -33,17 +32,17 @@ private async Task StreamingTask(CancellationToken cancellationToken)
 
             _logger.LogInformation("Waiting");
 
-            await Task.Delay(5000);
+            await Task.Delay(5000, cancellationToken);
 
             _logger.LogInformation("Spamming");
 
             while (!cancellationToken.IsCancellationRequested)
             {
                 counter++;
 
-                await _hubContext.Clients.All.SendAsync("ReceiveMessage", counter, counter);
+                await _hubContext.Clients.All.SendAsync("ReceiveMessage", counter, counter, cancellationToken);
 
-                await Task.Delay(1);
+                await Task.Delay(1, cancellationToken);
             }
         }
     }

src/Common/MemoryBufferWriter.cs

@@ -138,10 +138,10 @@ public override Task CopyToAsync(Stream destination, int bufferSize, Cancellatio
             if (_completedSegments == null)
             {
                 // There is only one segment so write without awaiting.
-                return destination.WriteAsync(_currentSegment!, 0, _position);
+                return destination.WriteAsync(_currentSegment!, 0, _position, cancellationToken);
             }
 
-            return CopyToSlowAsync(destination);
+            return CopyToSlowAsync(destination, cancellationToken);
         }
 
         private void EnsureCapacity(int sizeHint)
@@ -182,7 +182,7 @@ private void AddSegment(int sizeHint = 0)
             _position = 0;
         }
 
-        private async Task CopyToSlowAsync(Stream destination)
+        private async Task CopyToSlowAsync(Stream destination, CancellationToken cancellationToken)
         {
             if (_completedSegments != null)
             {
@@ -191,11 +191,20 @@ private async Task CopyToSlowAsync(Stream destination)
                 for (var i = 0; i < count; i++)
                 {
                     var segment = _completedSegments[i];
-                    await destination.WriteAsync(segment.Buffer, 0, segment.Length);
+#if NET6_0_OR_GREATER
+                    await destination.WriteAsync(segment.Buffer.AsMemory(0, segment.Length), cancellationToken);
+#else
+
+                    await destination.WriteAsync(segment.Buffer, 0, segment.Length, cancellationToken);
+#endif
                 }
             }
+#if NET6_0_OR_GREATER
+            await destination.WriteAsync(_currentSegment!.AsMemory(0, _position), cancellationToken);
+#else
 
-            await destination.WriteAsync(_currentSegment!, 0, _position);
+            await destination.WriteAsync(_currentSegment!, 0, _position, cancellationToken);
+#endif
         }
 
         public byte[] ToArray()

src/Microsoft.Azure.SignalR.Common/ServiceConnections/Internal/ForceAsyncAwaiter.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Runtime.CompilerServices;
 

src/Microsoft.Azure.SignalR.Common/ServiceConnections/MultiEndpointServiceConnectionContainer.cs

@@ -155,7 +155,6 @@ public Task<bool> WriteAckableMessageAsync(ServiceMessage serviceMessage, Cancel
         return CreateMessageWriter(serviceMessage).WriteAckableMessageAsync(serviceMessage, cancellationToken);
     }
 
-
     public IAsyncEnumerable<GroupMember> ListConnectionsInGroupAsync(string groupName, int? top = null, ulong? tracingId = null, CancellationToken token = default)
     {
         var targetEndpoints = _routerEndpoints.needRouter ? _router.GetEndpointsForGroup(groupName, _routerEndpoints.endpoints) : _routerEndpoints.endpoints;

src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionBase.cs

@@ -367,6 +367,10 @@ protected virtual Task DispatchMessageAsync(ServiceMessage message)
         };
     }
 
+    /// <summary>
+    /// Looks like it is virtual for ut, pretty tricky, TODO: improve, could use configurable keepaliveticks options to disable the ping
+    /// </summary>
+    /// <returns></returns>
     protected virtual async ValueTask TrySendPingAsync()
     {
         if (!_writeLock.Wait(0))
@@ -652,7 +656,7 @@ private async Task ProcessIncomingAsync(ConnectionContext connection)
                         UpdateReceiveTimestamp();
 
                         // No matter what kind of message come in, trigger send ping check
-                        _ = TrySendPingAsync();
+                        await TrySendPingAsync();
 
                         while (ServiceProtocol.TryParseMessage(ref buffer, out var message))
                         {

src/Microsoft.Azure.SignalR.Common/Utilities/AckHandler.cs

@@ -50,17 +50,17 @@ public Task<AckStatus> CreateSingleAck(out int id, TimeSpan? ackTimeout = defaul
         return info.Task;
     }
 
-        public Task<T> CreateSingleAck<T>(out int id, TimeSpan? ackTimeout = default, CancellationToken cancellationToken = default) where T : notnull, new()
+    public Task<T> CreateSingleAck<T>(out int id, TimeSpan? ackTimeout = default, CancellationToken cancellationToken = default) where T : notnull, new()
+    {
+        id = NextId();
+        if (_disposed)
         {
-            id = NextId();
-            if (_disposed)
-            {
-                return Task.FromResult(new T());
-            }
-            var info = (SinglePayloadAck<T>)_acks.GetOrAdd(id, _ => new SinglePayloadAck<T>(ackTimeout ?? _defaultAckTimeout));
-            cancellationToken.Register(info.Cancel);
-            return info.Task.ContinueWith(task => task.Result);
+            return Task.FromResult(new T());
         }
+        var info = (SinglePayloadAck<T>)_acks.GetOrAdd(id, _ => new SinglePayloadAck<T>(ackTimeout ?? _defaultAckTimeout));
+        cancellationToken.Register(info.Cancel);
+        return info.Task.ContinueWith(task => task.Result, TaskScheduler.Default);
+    }
 
     public static bool HandleAckStatus(IAckableMessage message, AckStatus status)
     {