Merge branch develop into privatekey-pkcs8

Author: scott-xu

.editorconfig

@@ -29,6 +29,12 @@ dotnet_diagnostic.S101.severity = none
 # This is a duplicate of CA2201 and MA0012.
 dotnet_diagnostic.S112.severity = none
 
+# S127: "for" loop stop conditions should be invariant
+# https://rules.sonarsource.com/csharp/RSPEC-127
+#
+# Limited use.
+dotnet_diagnostic.S127.severity = none
+
 # S907: Remove use of 'goto'
 # https://rules.sonarsource.com/csharp/RSPEC-907
 #
@@ -128,6 +134,12 @@ dotnet_diagnostic.S2259.severity = none
 # This is a duplicate of IDE0032.
 dotnet_diagnostic.S2292.severity = none
 
+# S2325: Methods and properties that don't access instance data should be static
+# https://rules.sonarsource.com/csharp/RSPEC-2325
+#
+# This is a duplicate of CA1822
+dotnet_diagnostic.S2325.severity = none
+
 # S2445: Blocks should be synchronized on read-only fields
 # https://rules.sonarsource.com/csharp/RSPEC-2445
 #

Directory.Packages.props

@@ -19,7 +19,7 @@
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.70-alpha" />
     <PackageVersion Include="PolySharp" Version="1.14.1" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.19.0.84025" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
     <PackageVersion Include="Testcontainers" Version="3.10.0" />

src/Renci.SshNet/Abstractions/CancellationTokenSourceExtensions.cs

@@ -0,0 +1,16 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Renci.SshNet.Abstractions
+{
+    internal static class CancellationTokenSourceExtensions
+    {
+#if !NET8_OR_GREATER
+        public static Task CancelAsync(this CancellationTokenSource cancellationTokenSource)
+        {
+            cancellationTokenSource.Cancel();
+            return Task.CompletedTask;
+        }
+#endif
+    }
+}

src/Renci.SshNet/Abstractions/StreamExtensions.cs

@@ -0,0 +1,18 @@
+#if !NET && !NETSTANDARD2_1_OR_GREATER
+using System.IO;
+using System.Threading.Tasks;
+#endif
+
+namespace Renci.SshNet.Abstractions
+{
+    internal static class StreamExtensions
+    {
+#if !NET && !NETSTANDARD2_1_OR_GREATER
+        public static ValueTask DisposeAsync(this Stream stream)
+        {
+            stream.Dispose();
+            return default;
+        }
+#endif
+    }
+}

src/Renci.SshNet/Security/Algorithm.cs

@@ -3,7 +3,9 @@
     /// <summary>
     /// Represents the abstract base class from which all implementations of algorithms must inherit.
     /// </summary>
+#pragma warning disable S1694 // An abstract class should have both abstract and concrete methods
     public abstract class Algorithm
+#pragma warning restore S1694 // An abstract class should have both abstract and concrete methods
     {
         /// <summary>
         /// Gets the algorithm name.

src/Renci.SshNet/Security/Cryptography/DigitalSignature.cs

@@ -3,7 +3,9 @@
     /// <summary>
     /// Base class for signature implementations.
     /// </summary>
+#pragma warning disable S1694 // An abstract class should have both abstract and concrete methods
     public abstract class DigitalSignature
+#pragma warning restore S1694 // An abstract class should have both abstract and concrete methods
     {
         /// <summary>
         /// Verifies the signature.

src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs

@@ -0,0 +1,16 @@
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Sftp.Responses
+{
+    /// <summary>
+    /// Extended Reply Info.
+    /// </summary>
+    internal interface IExtendedReplyInfo
+    {
+        /// <summary>
+        /// Loads the data from the stream into the instance.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        void LoadData(SshDataStream stream);
+    }
+}

src/Renci.SshNet/Sftp/Responses/ExtendedReplies/IExtendedReplyInfo.cs

@@ -2,11 +2,11 @@
 
 namespace Renci.SshNet.Sftp.Responses
 {
-    internal sealed class StatVfsReplyInfo : ExtendedReplyInfo
+    internal sealed class StatVfsReplyInfo : IExtendedReplyInfo
     {
         public SftpFileSystemInformation Information { get; private set; }
 
-        public override void LoadData(SshDataStream stream)
+        public void LoadData(SshDataStream stream)
         {
             Information = new SftpFileSystemInformation(stream.ReadUInt64(), // FileSystemBlockSize
                                                        stream.ReadUInt64(), // BlockSize

src/Renci.SshNet/Sftp/Responses/ExtendedReplies/StatVfsReplyInfo.cs

@@ -13,7 +13,7 @@ public SftpExtendedReplyResponse(uint protocolVersion)
         }
 
         public T GetReply<T>()
-            where T : ExtendedReplyInfo, new()
+            where T : IExtendedReplyInfo, new()
         {
             var result = new T();
             result.LoadData(DataStream);