Merge branch 'develop' into aesgcm-netframework

Author: scott-xu

README.md

@@ -176,7 +176,7 @@ OpenSSH certificate authentication is supported for all of the above, e.g. ssh-e
 
 **SSH.NET** supports the following target frameworks:
 * .NETFramework 4.6.2 (and higher)
-* .NET Standard 2.0 and 2.1
+* .NET Standard 2.0
 * .NET 8 (and higher)
 
 ## Building the library

src/Renci.SshNet/Abstractions/SocketExtensions.cs

@@ -93,11 +93,7 @@ public static async Task ConnectAsync(this Socket socket, EndPoint remoteEndpoin
             {
                 args.RemoteEndPoint = remoteEndpoint;
 
-#if NETSTANDARD2_1
-                await using (cancellationToken.Register(o => ((AwaitableSocketAsyncEventArgs)o).SetCancelled(), args, useSynchronizationContext: false).ConfigureAwait(continueOnCapturedContext: false))
-#else
                 using (cancellationToken.Register(o => ((AwaitableSocketAsyncEventArgs)o).SetCancelled(), args, useSynchronizationContext: false))
-#endif
                 {
                     await args.ExecuteAsync(socket.ConnectAsync);
                 }
@@ -112,11 +108,7 @@ public static async Task<int> ReceiveAsync(this Socket socket, byte[] buffer, in
             {
                 args.SetBuffer(buffer, offset, length);
 
-#if NETSTANDARD2_1
-                await using (cancellationToken.Register(o => ((AwaitableSocketAsyncEventArgs)o).SetCancelled(), args, useSynchronizationContext: false).ConfigureAwait(continueOnCapturedContext: false))
-#else
                 using (cancellationToken.Register(o => ((AwaitableSocketAsyncEventArgs)o).SetCancelled(), args, useSynchronizationContext: false))
-#endif
                 {
                     await args.ExecuteAsync(socket.ReceiveAsync);
                 }

src/Renci.SshNet/Abstractions/StreamExtensions.cs

@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if !NET
 using System;
 using System.IO;
 using System.Threading.Tasks;

src/Renci.SshNet/Channels/ChannelSession.cs

@@ -239,26 +239,18 @@ public bool SendSubsystemRequest(string subsystem)
         /// <param name="rows">The rows.</param>
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
-        /// <returns>
-        /// <see langword="true"/> if request was successful; otherwise <see langword="false"/>.
-        /// </returns>
-        public bool SendWindowChangeRequest(uint columns, uint rows, uint width, uint height)
+        public void SendWindowChangeRequest(uint columns, uint rows, uint width, uint height)
         {
             SendMessage(new ChannelRequestMessage(RemoteChannelNumber, new WindowChangeRequestInfo(columns, rows, width, height)));
-            return true;
         }
 
         /// <summary>
         /// Sends the local flow request.
         /// </summary>
         /// <param name="clientCanDo">if set to <see langword="true"/> [client can do].</param>
-        /// <returns>
-        /// <see langword="true"/> if request was successful; otherwise <see langword="false"/>.
-        /// </returns>
-        public bool SendLocalFlowRequest(bool clientCanDo)
+        public void SendLocalFlowRequest(bool clientCanDo)
         {
             SendMessage(new ChannelRequestMessage(RemoteChannelNumber, new XonXoffRequestInfo(clientCanDo)));
-            return true;
         }
 
         /// <summary>

src/Renci.SshNet/Channels/IChannelSession.cs

@@ -97,19 +97,13 @@ bool SendPseudoTerminalRequest(string environmentVariable,
         /// <param name="rows">The rows.</param>
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
-        /// <returns>
-        /// <see langword="true"/> if request was successful; otherwise <see langword="false"/>.
-        /// </returns>
-        bool SendWindowChangeRequest(uint columns, uint rows, uint width, uint height);
+        void SendWindowChangeRequest(uint columns, uint rows, uint width, uint height);
 
         /// <summary>
         /// Sends the local flow request.
         /// </summary>
         /// <param name="clientCanDo">if set to <see langword="true"/> [client can do].</param>
-        /// <returns>
-        /// <see langword="true"/> if request was successful; otherwise <see langword="false"/>.
-        /// </returns>
-        bool SendLocalFlowRequest(bool clientCanDo);
+        void SendLocalFlowRequest(bool clientCanDo);
 
         /// <summary>
         /// Sends the signal request.

src/Renci.SshNet/ClientAuthentication.cs

@@ -105,7 +105,7 @@ private bool TryAuthenticate(ISession session,
             {
                 authenticationException = new SshAuthenticationException(string.Format(CultureInfo.InvariantCulture,
                                                                                        "No suitable authentication method found to complete authentication ({0}).",
-#if NET || NETSTANDARD2_1
+#if NET
                                                                                        string.Join(',', allowedAuthenticationMethods)))
 #else
                                                                                        string.Join(",", allowedAuthenticationMethods)))

src/Renci.SshNet/Common/Extensions.cs

@@ -50,7 +50,7 @@ internal static ServiceName ToServiceName(this byte[] data)
 
         internal static BigInteger ToBigInteger(this ReadOnlySpan<byte> data)
         {
-#if NETSTANDARD2_1 || NET
+#if NET
             return new BigInteger(data, isBigEndian: true);
 #else
             var reversed = data.ToArray();
@@ -61,7 +61,7 @@ internal static BigInteger ToBigInteger(this ReadOnlySpan<byte> data)
 
         internal static BigInteger ToBigInteger(this byte[] data)
         {
-#if NETSTANDARD2_1 || NET
+#if NET
             return new BigInteger(data, isBigEndian: true);
 #else
             var reversed = new byte[data.Length];
@@ -76,7 +76,7 @@ internal static BigInteger ToBigInteger(this byte[] data)
         /// </summary>
         public static BigInteger ToBigInteger2(this byte[] data)
         {
-#if NETSTANDARD2_1 || NET
+#if NET
             return new BigInteger(data, isBigEndian: true, isUnsigned: true);
 #else
             if ((data[0] & (1 << 7)) != 0)
@@ -91,7 +91,7 @@ public static BigInteger ToBigInteger2(this byte[] data)
 #endif
         }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if !NET
         public static byte[] ToByteArray(this BigInteger bigInt, bool isUnsigned = false, bool isBigEndian = false)
         {
             var data = bigInt.ToByteArray();
@@ -361,7 +361,7 @@ internal static string Join(this IEnumerable<string> values, string separator)
             return string.Join(separator, values);
         }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if !NET
         internal static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue value)
         {
             if (!dictionary.ContainsKey(key))

src/Renci.SshNet/Common/PipeStream.cs

@@ -51,7 +51,7 @@ public override int Read(byte[] buffer, int offset, int count)
             return Read(buffer.AsSpan(offset, count));
         }
 
-#if NETSTANDARD2_1 || NET
+#if NET
         /// <inheritdoc/>
         public override int Read(Span<byte> buffer)
 #else
@@ -99,7 +99,7 @@ public override void Write(byte[] buffer, int offset, int count)
             }
         }
 
-#if NETSTANDARD2_1 || NET
+#if NET
         /// <inheritdoc/>
         public override void Write(ReadOnlySpan<byte> buffer)
         {
@@ -157,7 +157,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
             return WriteAsync(buffer.AsMemory(offset, count), cancellationToken).AsTask();
         }
 
-#if NETSTANDARD2_1 || NET
+#if NET
         /// <inheritdoc/>
         public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
 #else

src/Renci.SshNet/Common/SshData.cs

@@ -372,7 +372,7 @@ protected void Write(BigInteger data)
         /// <param name="data">name-list data to write.</param>
         protected void Write(string[] data)
         {
-#if NET || NETSTANDARD2_1
+#if NET
             Write(string.Join(',', data), Ascii);
 #else
             Write(string.Join(",", data), Ascii);

src/Renci.SshNet/Common/SshDataStream.cs

@@ -59,7 +59,7 @@ public bool IsEndOfData
             }
         }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if !NET
         private void Write(ReadOnlySpan<byte> buffer)
         {
             var sharedBuffer = System.Buffers.ArrayPool<byte>.Shared.Rent(buffer.Length);
@@ -129,7 +129,7 @@ public void Write(string s, Encoding encoding)
             ThrowHelper.ThrowIfNull(s);
             ThrowHelper.ThrowIfNull(encoding);
 
-#if NETSTANDARD2_1 || NET
+#if NET
             ReadOnlySpan<char> value = s;
             var count = encoding.GetByteCount(value);
             var bytes = count <= 256 ? stackalloc byte[count] : new byte[count];
@@ -220,7 +220,7 @@ public void WriteBinary(byte[] buffer, int offset, int count)
         /// </returns>
         public BigInteger ReadBigInt()
         {
-#if NETSTANDARD2_1 || NET
+#if NET
             var data = ReadBinarySegment();
             return new BigInteger(data, isBigEndian: true);
 #else