From 4480a78b4274846920f6167e5484d726ded66dea Mon Sep 17 00:00:00 2001
From: AnduinXue <anduin@aiursoft.com>
Date: Sun, 21 Jan 2024 06:56:24 +0000
Subject: [PATCH] Upgrade packages.

---
 .../Aiursoft.ChessServer.csproj               |  4 +-
 .../Controllers/GamesController.cs            |  3 +-
 .../Controllers/HomeController.cs             |  4 +-
 src/Aiursoft.ChessServer/Startup.cs           |  2 +-
 .../Aiursoft.ChessServer.Tests.csproj         | 48 +++++++++----------
 .../Aiursoft.ChessServer.Tests/BasicTests.cs  |  4 +-
 6 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/Aiursoft.ChessServer/Aiursoft.ChessServer.csproj b/src/Aiursoft.ChessServer/Aiursoft.ChessServer.csproj
index 6c7a46a..fd2cac1 100644
--- a/src/Aiursoft.ChessServer/Aiursoft.ChessServer.csproj
+++ b/src/Aiursoft.ChessServer/Aiursoft.ChessServer.csproj
@@ -10,8 +10,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Aiursoft.AiurObserver.Extensions" Version="7.0.21" />
+    <PackageReference Include="Aiursoft.AiurObserver.WebSocket.Server" Version="7.0.21" />
     <PackageReference Include="Aiursoft.Scanner" Version="7.0.1" />
-    <PackageReference Include="Aiursoft.WebTools" Version="7.0.29" />
+    <PackageReference Include="Aiursoft.WebTools" Version="7.0.31" />
     <PackageReference Include="Gera.Chess" Version="1.0.5" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Aiursoft.ChessServer/Controllers/GamesController.cs b/src/Aiursoft.ChessServer/Controllers/GamesController.cs
index 9e92f3e..79bddab 100644
--- a/src/Aiursoft.ChessServer/Controllers/GamesController.cs
+++ b/src/Aiursoft.ChessServer/Controllers/GamesController.cs
@@ -1,8 +1,9 @@
 using Aiursoft.AiurObserver;
+using Aiursoft.AiurObserver.WebSocket.Server;
 using Aiursoft.ChessServer.Data;
 using Aiursoft.ChessServer.Models.ViewModels;
-using Aiursoft.WebTools.Services;
 using Microsoft.AspNetCore.Mvc;
+using Aiursoft.AiurObserver.Extensions;
 
 namespace Aiursoft.ChessServer.Controllers;
 
diff --git a/src/Aiursoft.ChessServer/Controllers/HomeController.cs b/src/Aiursoft.ChessServer/Controllers/HomeController.cs
index 0418350..23dd98a 100644
--- a/src/Aiursoft.ChessServer/Controllers/HomeController.cs
+++ b/src/Aiursoft.ChessServer/Controllers/HomeController.cs
@@ -1,9 +1,9 @@
-using Aiursoft.AiurObserver;
+using Aiursoft.AiurObserver.Extensions;
+using Aiursoft.AiurObserver.WebSocket.Server;
 using Aiursoft.ChessServer.Data;
 using Aiursoft.ChessServer.Models;
 using Aiursoft.ChessServer.Models.ViewModels;
 using Aiursoft.CSTools.Services;
-using Aiursoft.WebTools.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Aiursoft.ChessServer.Controllers;
diff --git a/src/Aiursoft.ChessServer/Startup.cs b/src/Aiursoft.ChessServer/Startup.cs
index 907e7aa..3d81ec9 100644
--- a/src/Aiursoft.ChessServer/Startup.cs
+++ b/src/Aiursoft.ChessServer/Startup.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using Aiursoft.ChessServer.Middlewares;
 using Aiursoft.Scanner;
-using Aiursoft.WebTools.Models;
+using Aiursoft.WebTools.Abstractions.Models;
 
 namespace Aiursoft.ChessServer;
 
diff --git a/tests/Aiursoft.ChessServer.Tests/Aiursoft.ChessServer.Tests.csproj b/tests/Aiursoft.ChessServer.Tests/Aiursoft.ChessServer.Tests.csproj
index 634247e..1465915 100644
--- a/tests/Aiursoft.ChessServer.Tests/Aiursoft.ChessServer.Tests.csproj
+++ b/tests/Aiursoft.ChessServer.Tests/Aiursoft.ChessServer.Tests.csproj
@@ -1,25 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
-		<RootNamespace>Aiursoft.ChessServer.Tests</RootNamespace>
-		<IsTestProject>true</IsTestProject>
-		<IsPackable>false</IsPackable>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="JunitXml.TestLogger" Version="3.0.134" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-		<PackageReference Include="AngleSharp" Version="1.0.7" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\..\src\Aiursoft.ChessServer\Aiursoft.ChessServer.csproj" />
-	</ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <RootNamespace>Aiursoft.ChessServer.Tests</RootNamespace>
+    <IsTestProject>true</IsTestProject>
+    <IsPackable>false</IsPackable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="JunitXml.TestLogger" Version="3.0.134" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="AngleSharp" Version="1.1.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Aiursoft.ChessServer\Aiursoft.ChessServer.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/Aiursoft.ChessServer.Tests/BasicTests.cs b/tests/Aiursoft.ChessServer.Tests/BasicTests.cs
index a8ff703..1bba0a4 100644
--- a/tests/Aiursoft.ChessServer.Tests/BasicTests.cs
+++ b/tests/Aiursoft.ChessServer.Tests/BasicTests.cs
@@ -1,6 +1,6 @@
-using Aiursoft.AiurObserver;
+using Aiursoft.AiurObserver.DefaultConsumers;
+using Aiursoft.AiurObserver.WebSocket;
 using Aiursoft.CSTools.Tools;
-using Aiursoft.WebTools.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using static Aiursoft.WebTools.Extends;