Update for .NET Standard 2.0

LiveOrDevTrying · May 30, 2023 · 1bc10ab · 1bc10ab
1 parent 1c4f8c0
commit 1bc10ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs b/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs
@@ -213,9 +213,9 @@ protected virtual async Task ReceiveAsync(CancellationToken cancellationToken)
                         {
                             if (_connection.TcpClient.Available > 0)
                             {
-                                var buffer = new ArraySegment<byte>(new byte[_connection.TcpClient.Available]);
-                                var result = await _connection.TcpClient.Client.ReceiveAsync(buffer, SocketFlags.None, cancellationToken).ConfigureAwait(false);
-                                await _connection.MemoryStream.WriteAsync(buffer.Array.AsMemory(buffer.Offset, result), cancellationToken).ConfigureAwait(false);
+                                var buffer = new byte[_connection.TcpClient.Available];
+                                var result = _connection.TcpClient.Client.Receive(buffer);
+                                await _connection.MemoryStream.WriteAsync(buffer, 0, result, cancellationToken).ConfigureAwait(false);
 
                                 _connection.EndOfLine = Statics.ByteArrayContainsSequence(_connection.MemoryStream.GetBuffer(), _parameters.EndOfLineBytes) > -1;
                             }
@@ -277,7 +277,7 @@ protected virtual async Task ReceiveAsync(CancellationToken cancellationToken)
 
                         if (bytes.Length > 0)
                         {
-                            await _connection.MemoryStream.WriteAsync(bytes, cancellationToken);
+                            await _connection.MemoryStream.WriteAsync(bytes, 0, bytes.Length, cancellationToken);
                         }
                     }
                 }

diff --git a/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs b/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs
@@ -218,7 +218,7 @@ protected virtual async Task ReceiveAsync(Z connection, CancellationToken cancel
                             {
                                 var buffer = new byte[connection.TcpClient.Available];
                                 var result = connection.TcpClient.Client.Receive(buffer, SocketFlags.None);
-                                await connection.MemoryStream.WriteAsync(buffer.Array.AsMemory(buffer.Offset, result), cancellationToken).ConfigureAwait(false);
+                                await connection.MemoryStream.WriteAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false);
 
                                 connection.EndOfLine = Statics.ByteArrayContainsSequence(connection.MemoryStream.GetBuffer(), _parameters.EndOfLineBytes) > -1;
                             }
@@ -275,7 +275,7 @@ protected virtual async Task ReceiveAsync(Z connection, CancellationToken cancel
                             }
                         }
 
-                        await connection.MemoryStream.WriteAsync(bytes, cancellationToken);
+                        await connection.MemoryStream.WriteAsync(bytes, 0, bytes.Length, cancellationToken);
                     }
                 }
             }
@@ -300,7 +300,7 @@ public override async Task<bool> SendAsync(string message, Z connection, Cancell
                 if (connection.TcpClient.Connected && connection.TcpClient.Client != null && !cancellationToken.IsCancellationRequested && _isRunning && !string.IsNullOrWhiteSpace(message))
                 {
                     var bytes = Statics.ByteArrayAppend(Encoding.UTF8.GetBytes(message), _parameters.EndOfLineBytes);
-                    await connection.TcpClient.Client.SendAsync(new ArraySegment<byte>(bytes), SocketFlags.None, cancellationToken).ConfigureAwait(false);
+                    connection.TcpClient.Client.Send(bytes, 0, bytes.Length, SocketFlags.None, out var error);
 
                     FireEvent(this, CreateMessageEventArgs(new TcpMessageServerBaseEventArgs<Z>
                     {
@@ -336,7 +336,7 @@ public override async Task<bool> SendAsync(byte[] message, Z connection, Cancell
                 if (connection.TcpClient.Connected && connection.TcpClient.Client != null && !cancellationToken.IsCancellationRequested && _isRunning && message.Where(x => x != 0).Any())
                 {
                     var bytes = Statics.ByteArrayAppend(message, _parameters.EndOfLineBytes);
-                    await connection.TcpClient.Client.SendAsync(new ArraySegment<byte>(bytes), SocketFlags.None, cancellationToken).ConfigureAwait(false);
+                    connection.TcpClient.Client.Send(bytes, 0, bytes.Length, SocketFlags.None, out var error);
 
                     FireEvent(this, CreateMessageEventArgs(new TcpMessageServerBaseEventArgs<Z>
                     {

diff --git a/TestApps/Tcp.NET.TestApps.Client/Program.cs b/TestApps/Tcp.NET.TestApps.Client/Program.cs
@@ -97,7 +97,7 @@ private static void OnConnectionEvent(object sender, TcpConnectionClientEventArg
                     break;
                 case ConnectionEventType.Disconnect:
                     var client = (ITcpNETClient)sender;
-                    _clients.TryRemove(_clients.FirstOrDefault(x => x.Key == client.GetHashCode()));
+                    _clients.TryRemove(client.GetHashCode(), out var _);
 
                     client.ConnectionEvent -= OnConnectionEvent;
                     client.MessageEvent -= OnMessageEvent;