fix warnings

.editorconfig

@@ -256,6 +256,9 @@ dotnet_diagnostic.CA1816.severity = none
 
 # CA1859: Use concrete types when possible for improved performance
 dotnet_diagnostic.CA1859.severity = none
+
+# xUnit1051: Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken
+dotnet_diagnostic.xUnit1051.severity = none
 
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line

src/SuperSocket.Primitives/CertificateOptions.cs

@@ -57,7 +57,12 @@ public X509Certificate GetCertificate()
                     filePath = Path.Combine(AppContext.BaseDirectory, filePath);
                 }
 
+#if NET9_0_OR_GREATER
+                return X509CertificateLoader.LoadPkcs12FromFile(filePath, Password, KeyStorageFlags);
+#else
                 return new X509Certificate2(filePath, Password, KeyStorageFlags);
+#endif
+
             }
             else if (!string.IsNullOrEmpty(Thumbprint)) // Load certificate from certificate store
             {

test/SuperSocket.Benchmarks/SuperSocket.Benchmarks.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Description>SuperSocket benchmarking project for performance testing and analysis of core components using BenchmarkDotNet.</Description>
   </PropertyGroup>

test/SuperSocket.Tests/ClientTest.cs

@@ -164,7 +164,7 @@
                         if (e.SocketErrorCode == SocketError.AccessDenied || e.SocketErrorCode == SocketError.AddressAlreadyInUse)
                             continue;
 
-                        throw e;
+                        throw;
                     }
 
                     break;                    
@@ -203,7 +203,7 @@
             var cts = new CancellationTokenSource();
             cts.CancelAfter(TimeSpan.FromSeconds(1));
             var result = client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, localPort), cts.Token).AsTask();
             int index = Task.WaitAny(new[] { result }, TimeSpan.FromSeconds(2));
             var hasWaitedLongerThanTheCancellationToken = index == -1;
 
             Assert.False(hasWaitedLongerThanTheCancellationToken);

test/SuperSocket.Tests/CommandTest.cs

@@ -101,7 +101,7 @@ public async Task TestUnknownCommands(Type hostConfiguratorType)
                     commandOptions.AddCommand<ADD>();
                     commandOptions.RegisterUnknownPackageHandler<StringPackageInfo>(async (session, package, cancellationToken) =>
                     {
-                        await session.SendAsync(Encoding.UTF8.GetBytes("X\r\n"));
+                        await session.SendAsync(Encoding.UTF8.GetBytes("X\r\n"), cancellationToken);
                     });
 
                     // register all commands in one assembly
@@ -384,7 +384,7 @@ public COUNT(IPackageEncoder<string> encoder)
 
             public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo package, CancellationToken cancellationToken)
             {
-                await session.SendAsync(_encoder, "OK\r\n");
+                await session.SendAsync(_encoder, "OK\r\n", cancellationToken);
             }
         }
 
@@ -400,7 +400,7 @@ public COUNTDOWN(IPackageEncoder<string> encoder)
 
             public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo package, CancellationToken cancellationToken)
             {
-                await session.SendAsync(_encoder, "OK\r\n");
+                await session.SendAsync(_encoder, "OK\r\n", cancellationToken);
             }
         }
 

test/SuperSocket.Tests/Commands.cs

@@ -26,7 +26,7 @@ public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo packa
                 .Select(p => int.Parse(p))
                 .Sum();
 
-            await session.SendAsync(Encoding.UTF8.GetBytes(result.ToString() + "\r\n"));
+            await session.SendAsync(Encoding.UTF8.GetBytes(result.ToString() + "\r\n"), cancellationToken);
         }
     }
 
@@ -38,7 +38,7 @@ public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo packa
                 .Select(p => int.Parse(p))
                 .Aggregate((x, y) => x * y);
 
-            await session.SendAsync(Encoding.UTF8.GetBytes(result.ToString() + "\r\n"));
+            await session.SendAsync(Encoding.UTF8.GetBytes(result.ToString() + "\r\n"), cancellationToken);
         }
     }
 
@@ -58,7 +58,7 @@ public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo packa
                 .Aggregate((x, y) => x - y);
 
             // encode the text message by encoder
-            await session.SendAsync(_encoder, result.ToString() + "\r\n");
+            await session.SendAsync(_encoder, result.ToString() + "\r\n", cancellationToken);
         }
     }
 

test/SuperSocket.Tests/MainTest.cs

@@ -23,13 +23,12 @@
 using SuperSocket.Server.Host;
 using Xunit;
 
-/// <summary>
-/// Run selected test case by command
-/// dotnet test --filter 'FullyQualifiedName=SuperSocket.Tests.SessionTest.TestCloseReason'
-/// </summary>
-
 namespace SuperSocket.Tests
 {
+    /// <summary>
+    /// Run selected test case by command
+    /// dotnet test --filter 'FullyQualifiedName=SuperSocket.Tests.SessionTest.TestCloseReason'
+    /// </summary>
     [Trait("Category", "Basic")]
     public class MainTest : TestClassBase
     {
@@ -800,8 +799,6 @@ public async Task TestMultipleServerHostWithConfigureServerOptions()
             var server1 = default(IServer);
             var server2 = default(IServer);
 
-            IHostEnvironment actualHostEvn = null;
-
             var hostBuilder = MultipleServerHostBuilder.Create()                
                 .AddServer<SuperSocketServiceA, TextPackageInfo, LinePipelineFilter>(builder =>
                 {

test/SuperSocket.Tests/PackageHandlingContextAccessorTest.cs

@@ -92,7 +92,7 @@ public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo packa
 
                     Assert.Equal(packageHandlingContextAccessor.PackageHandlingContext.AppSession, session);
                     Assert.Equal(packageHandlingContextAccessor.PackageHandlingContext.PackageInfo, package);
-                    await session.SendAsync(Encoding.UTF8.GetBytes(package.Body + "\r\n"));
+                    await session.SendAsync(Encoding.UTF8.GetBytes(package.Body + "\r\n"), cancellationToken);
                 }
             }
         }

test/SuperSocket.Tests/SessionContainerTest.cs

@@ -24,7 +24,7 @@ class SESS : IAsyncCommand<StringPackageInfo>
         {
             public async ValueTask ExecuteAsync(IAppSession session, StringPackageInfo package, CancellationToken cancellationToken)
             {
-                await session.SendAsync(Encoding.UTF8.GetBytes(session.SessionID + "\r\n"));
+                await session.SendAsync(Encoding.UTF8.GetBytes(session.SessionID + "\r\n"), cancellationToken);
             }
         }
 

test/SuperSocket.Tests/WebSocket/WebSocketBasicTest.cs

@@ -310,7 +310,7 @@ public async Task TestEmptyMessage(Type hostConfiguratorType)
 
                 Assert.Equal(WebSocketState.Open, websocket.State);
 
-                var data = new byte[0];
+                var data = Array.Empty<byte>();
                 var segment = new ArraySegment<byte>(data, 0, data.Length);
 
                 await websocket.SendAsync(segment, WebSocketMessageType.Text, true, CancellationToken.None);
@@ -1206,7 +1206,7 @@ public async ValueTask ExecuteAsync(WebSocketSession session, StringPackageInfo
                     .Select(p => int.Parse(p))
                     .Sum();
 
-                await session.SendAsync(result.ToString());
+                await session.SendAsync(result.ToString(), cancellationToken);
             }
         }
 
@@ -1218,7 +1218,7 @@ public async ValueTask ExecuteAsync(WebSocketSession session, StringPackageInfo
                     .Select(p => int.Parse(p))
                     .Aggregate((x, y) => x * y);
 
-                await session.SendAsync(result.ToString());
+                await session.SendAsync(result.ToString(), cancellationToken);
             }
         }
 
@@ -1230,7 +1230,7 @@ public async ValueTask ExecuteAsync(WebSocketSession session, StringPackageInfo
                     .Select(p => int.Parse(p))
                     .Aggregate((x, y) => x - y);
 
-                await session.SendAsync(result.ToString());
+                await session.SendAsync(result.ToString(), cancellationToken);
             }
         }