reduce CA1849 suppressions

and disable duplicate S6966

Author: mus65

.editorconfig

@@ -344,6 +344,10 @@ dotnet_diagnostic.S5659.severity = none
 # https://rules.sonarsource.com/csharp/RSPEC-5773/
 dotnet_diagnostic.S4581.severity = none
 
+# S6966: Awaitable method should be used
+# Duplicate of CA1849
+dotnet_diagnostic.S6966.severity = none
+
 #### StyleCop rules ####
 
 # SA1003: Symbols must be spaced correctly

src/Renci.SshNet/SftpClient.cs

@@ -2269,7 +2269,7 @@ private List<ISftpFile> InternalListDirectory(string path, SftpListDirectoryAsyn
             return result;
         }
 
-#pragma warning disable S6966 // Awaitable method should be used
+#pragma warning disable CA1849 // Call async methods when in an async method
         private async Task InternalDownloadFile(
             string path,
             Stream output,
@@ -2330,15 +2330,13 @@ private async Task InternalDownloadFile(
                         break;
                     }
 
-#pragma warning disable CA1849 // Call async methods when in an async method
                     var bytesRead = isAsync
 #if NET
                         ? await sftpStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false)
 #else
                         ? await sftpStream.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)
 #endif
                         : sftpStream.Read(buffer, 0, buffer.Length);
-#pragma warning restore CA1849 // Call async methods when in an async method
 
                     if (bytesRead == 0)
                     {
@@ -2355,9 +2353,7 @@ private async Task InternalDownloadFile(
                     }
                     else
                     {
-#pragma warning disable CA1849 // Call async methods when in an async method
                         output.Write(buffer, 0, bytesRead);
-#pragma warning restore CA1849 // Call async methods when in an async method
                     }
 
                     totalBytesRead += (ulong)bytesRead;
@@ -2384,15 +2380,11 @@ private async Task InternalDownloadFile(
                 }
                 else
                 {
-#pragma warning disable CA1849 // Call async methods when in an async method
                     sftpStream.Dispose();
-#pragma warning restore CA1849 // Call async methods when in an async method
                 }
             }
         }
-#pragma warning restore S6966 // Awaitable method should be used
 
-#pragma warning disable S6966 // Awaitable method should be used
         private async Task InternalUploadFile(
             Stream input,
             string path,
@@ -2439,15 +2431,13 @@ private async Task InternalUploadFile(
 
             while (true)
             {
-#pragma warning disable CA1849 // Call async methods when in an async method
                 var bytesRead = isAsync
 #if NET
                     ? await input.ReadAsync(buffer, cancellationToken).ConfigureAwait(false)
 #else
                     ? await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)
 #endif
                     : input.Read(buffer, 0, buffer.Length);
-#pragma warning restore CA1849 // Call async methods when in an async method
 
                 if (bytesRead == 0)
                 {
@@ -2533,7 +2523,7 @@ private async Task InternalUploadFile(
                 _sftpSession.RequestClose(handle);
             }
         }
-#pragma warning restore S6966 // Awaitable method should be used
+#pragma warning restore CA1849 // Call async methods when in an async method
 
         /// <summary>
         /// Called when client is connected to the server.

test/Renci.SshNet.IntegrationTests/TestsFixtures/InfrastructureFixture.cs

@@ -91,7 +91,6 @@ public async Task DisposeAsync()
         {
             if (_sshServer != null)
             {
-#pragma warning disable S6966 // Awaitable method should be used
                 //try
                 //{
                 //    File.WriteAllBytes(@"C:\tmp\auth.log", await _sshServer.ReadFileAsync("/var/log/auth.log").ConfigureAwait(false));
@@ -100,7 +99,6 @@ public async Task DisposeAsync()
                 //{
                 //    Console.Error.WriteLine(ex.ToString());
                 //}
-#pragma warning restore S6966 // Awaitable method should be used
 
                 await _sshServer.DisposeAsync();
             }