feat: Update to net8.0.

HavenDV · Dec 21, 2023 · 8b04f80 · 8b04f80
1 parent 4f8546d
commit 8b04f80
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 25 deletions.
diff --git a/src/libs/H.Engine.IO/EngineIoClient.cs b/src/libs/H.Engine.IO/EngineIoClient.cs
@@ -33,6 +33,11 @@ public sealed partial class EngineIoClient : IDisposable
 
     #region Properties
 
+    private JsonSerializerOptions _jsonSerializerOptions = new()
+    {
+        PropertyNameCaseInsensitive = true,
+    };
+
     /// <summary>
     /// Internal WebSocket Client
     /// </summary>
@@ -140,10 +145,7 @@ private void WebSocketClient_OnTextReceived(object? sender, WebSocketClient.Text
             switch (packet.Prefix)
             {
                 case EngineIoPacket.OpenPrefix:
-                    OpenMessage = JsonSerializer.Deserialize<EngineIoOpenMessage>(packet.Value, new JsonSerializerOptions
-                    {
-                        PropertyNameCaseInsensitive = true,
-                    });
+                    OpenMessage = JsonSerializer.Deserialize<EngineIoOpenMessage>(packet.Value, _jsonSerializerOptions);
                     IsOpened = true;
 
                     Timer.Interval = OpenMessage?.PingInterval ?? 25000;

diff --git a/src/libs/H.Engine.IO/H.Engine.IO.csproj b/src/libs/H.Engine.IO/H.Engine.IO.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net4.6.2;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net4.6.2;net6.0;net7.0;net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1031;CS3016</NoWarn>
   </PropertyGroup>
 

diff --git a/src/libs/H.Socket.IO/H.Socket.IO.csproj b/src/libs/H.Socket.IO/H.Socket.IO.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net4.6.2;net6.0;net7.0</TargetFrameworks>
-    <NoWarn>$(NoWarn);CA1031;CS3016</NoWarn>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net4.6.2;net6.0;net7.0;net8.0</TargetFrameworks>
+    <NoWarn>$(NoWarn);CA1031;CS3016;CA1867</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet">

diff --git a/src/libs/H.Socket.IO/SocketIoClient.cs b/src/libs/H.Socket.IO/SocketIoClient.cs
@@ -285,16 +285,19 @@ public async Task<bool> ConnectAsync(Uri uri, CancellationToken cancellationToke
     /// <param name="namespaces"></param>
     /// <exception cref="ObjectDisposedException"></exception>
     /// <returns></returns>
-    public async Task<bool> ConnectToNamespacesAsync(CancellationToken cancellationToken = default, params string[] namespaces)
+    public async Task<bool> ConnectToNamespacesAsync(
+        CancellationToken cancellationToken = default,
+        params string[] namespaces)
     {
         EngineIoClient = EngineIoClient ?? throw new ObjectDisposedException(nameof(EngineIoClient));
-
+        namespaces = namespaces ?? throw new ArgumentNullException(nameof(namespaces));
+
         if (!EngineIoClient.IsOpened)
         {
             return false;
         }
 
-        if (!namespaces.Any())
+        if (namespaces.Length == 0)
         {
             return true;
         }
@@ -488,12 +491,13 @@ public void On<T>(string name, Action<T, string> action, string? customNamespace
         action = action ?? throw new ArgumentNullException(nameof(action));
 
         var key = GetOnKey(name, customNamespace);
-        if (!JsonDeserializeActions.ContainsKey(key))
+        if (!JsonDeserializeActions.TryGetValue(key, out var value))
         {
-            JsonDeserializeActions[key] = new List<(Action<object, string> Action, Type Type)>();
+            value = new List<(Action<object, string> Action, Type Type)>();
+            JsonDeserializeActions[key] = value;
         }
 
-        JsonDeserializeActions[key].Add(((obj, text) => action((T)obj, text), typeof(T)));
+        value.Add(((obj, text) => action((T)obj, text), typeof(T)));
     }
 
     /// <summary>
@@ -527,12 +531,13 @@ public void On(string name, Action<string> action, string? customNamespace = nul
         action = action ?? throw new ArgumentNullException(nameof(action));
 
         var key = GetOnKey(name, customNamespace);
-        if (!TextActions.ContainsKey(key))
+        if (!TextActions.TryGetValue(key, out var value))
         {
-            TextActions[key] = new List<Action<string>>();
+            value = new List<Action<string>>();
+            TextActions[key] = value;
         }
 
-        TextActions[key].Add(action);
+        value.Add(action);
     }
 
     /// <summary>
@@ -548,12 +553,13 @@ public void On(string name, Action action, string? customNamespace = null)
         action = action ?? throw new ArgumentNullException(nameof(action));
 
         var key = GetOnKey(name, customNamespace);
-        if (!Actions.ContainsKey(key))
+        if (!Actions.TryGetValue(key, out var value))
         {
-            Actions[key] = new List<Action>();
+            value = new List<Action>();
+            Actions[key] = value;
         }
 
-        Actions[key].Add(action);
+        value.Add(action);
     }
 
     /// <summary>

diff --git a/src/libs/H.WebSockets/H.WebSockets.csproj b/src/libs/H.WebSockets/H.WebSockets.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net4.5.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net4.5.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1031;CS3016</NoWarn>
   </PropertyGroup>
 

diff --git a/src/libs/H.WebSockets/Utilities/EventExtensions.cs b/src/libs/H.WebSockets/Utilities/EventExtensions.cs
@@ -185,7 +185,11 @@ public static async Task<Dictionary<string, T>> WaitAnyEventAsync<T>(this object
 
             await Task.WhenAny(tasks).ConfigureAwait(false);
 
+#if NET8_0_OR_GREATER
+            await cts.CancelAsync().ConfigureAwait(false);
+#else
             cts.Cancel();
+#endif
         }
         catch (OperationCanceledException)
         {

diff --git a/src/libs/H.WebSockets/Utilities/TaskWorker.cs b/src/libs/H.WebSockets/Utilities/TaskWorker.cs
@@ -141,7 +141,11 @@ public async ValueTask DisposeAsync()
 
         if (Task != Task.CompletedTask)
         {
+#if NET8_0_OR_GREATER
+            await CancellationTokenSource.CancelAsync().ConfigureAwait(false);
+#else
             CancellationTokenSource.Cancel();
+#endif
 
             try
             {

diff --git a/src/tests/H.Engine.IO.IntegrationTests/H.Engine.IO.IntegrationTests.csproj b/src/tests/H.Engine.IO.IntegrationTests/H.Engine.IO.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net4.8</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="GlobalUsings">

diff --git a/src/tests/H.Engine.IO.UnitTests/H.Engine.IO.UnitTests.csproj b/src/tests/H.Engine.IO.UnitTests/H.Engine.IO.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net4.8</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="GlobalUsings">

diff --git a/src/tests/H.Socket.IO.IntegrationTests/H.Socket.IO.IntegrationTests.csproj b/src/tests/H.Socket.IO.IntegrationTests/H.Socket.IO.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net4.8</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="GlobalUsings">

diff --git a/src/tests/H.Socket.IO.UnitTests/H.Socket.IO.UnitTests.csproj b/src/tests/H.Socket.IO.UnitTests/H.Socket.IO.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net4.8</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="GlobalUsings">

diff --git a/src/tests/H.WebSockets.IntegrationTests/H.WebSockets.IntegrationTests.csproj b/src/tests/H.WebSockets.IntegrationTests/H.WebSockets.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net4.8</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="GlobalUsings">