diff --git a/Server/ILLink/ILLink.Descriptors.LibraryBuild.xml b/Server/ILLink/ILLink.Descriptors.LibraryBuild.xml new file mode 100644 index 0000000..a42d7f0 --- /dev/null +++ b/Server/ILLink/ILLink.Descriptors.LibraryBuild.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Server/Server.csproj b/Server/Server.csproj index a934b2f..1ff2149 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -12,7 +12,7 @@ PSO2SERVER.ServerApp - v4.8 + v4.8.1 false publish\ @@ -84,7 +84,7 @@ - ..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll + ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll @@ -92,8 +92,8 @@ ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\Google.Protobuf.3.28.1\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.29.1\lib\net45\Google.Protobuf.dll ..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll @@ -107,8 +107,8 @@ ..\packages\KeraLua.1.4.1\lib\net46\KeraLua.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -116,11 +116,11 @@ True True - - ..\packages\MySql.Data.9.0.0\lib\net48\MySql.Data.dll + + ..\packages\MySql.Data.9.1.0\lib\net48\MySql.Data.dll - - ..\packages\MySql.Data.EntityFramework.9.0.0\lib\net48\MySql.Data.EntityFramework.dll + + ..\packages\MySql.Data.EntityFramework.9.1.0\lib\net48\MySql.Data.EntityFramework.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -134,16 +134,16 @@ True True - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll + + ..\packages\System.Configuration.ConfigurationManager.9.0.0\lib\net462\System.Configuration.ConfigurationManager.dll - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll True True @@ -154,8 +154,8 @@ ..\packages\BCrypt-Official.0.1.109\lib\BCrypt.Net.dll - - ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -196,8 +196,8 @@ True True - - ..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll @@ -210,11 +210,11 @@ True - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll True True @@ -224,24 +224,24 @@ True - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll True True - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + + ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll True True - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll + + ..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll True True @@ -257,7 +257,7 @@ - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll True True @@ -271,24 +271,24 @@ True True - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True True - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll + ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll True True - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll True True @@ -298,8 +298,8 @@ ..\packages\UltimateOrb.Mathematics.DoubleArithmetic.Core.1.2.12\lib\netstandard1.0\UltimateOrb.Mathematics.DoubleArithmetic.Core.dll - - ..\packages\ZstdSharp.Port.0.8.1\lib\net462\ZstdSharp.dll + + ..\packages\ZstdSharp.Port.0.8.3\lib\net462\ZstdSharp.dll @@ -639,6 +639,7 @@ + @@ -683,7 +684,9 @@ + + \ No newline at end of file diff --git a/Server/app.config b/Server/app.config index 1e06da8..8f3526f 100644 --- a/Server/app.config +++ b/Server/app.config @@ -1,46 +1,54 @@ - + -
+
- - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - - - - + + + + - + - \ No newline at end of file + diff --git a/Server/packages.config b/Server/packages.config index 28a146b..9faeb61 100644 --- a/Server/packages.config +++ b/Server/packages.config @@ -1,30 +1,30 @@  - + - + - - + + - - - + + + - + - - + + - + @@ -34,40 +34,40 @@ - + - - - + + + - + - - - + + + - + - + - + - + - + - + \ No newline at end of file diff --git a/ServerTest/ServerTest.csproj b/ServerTest/ServerTest.csproj index 9b20ba1..f7e5be4 100644 --- a/ServerTest/ServerTest.csproj +++ b/ServerTest/ServerTest.csproj @@ -1,5 +1,6 @@  + Debug @@ -39,25 +40,28 @@ False ..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll - - ..\packages\NUnit.2.7.1\lib\nunit.framework.dll + + ..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll + + + ..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -101,5 +105,6 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + \ No newline at end of file diff --git a/ServerTest/app.config b/ServerTest/app.config index 9c9108b..78190d7 100644 --- a/ServerTest/app.config +++ b/ServerTest/app.config @@ -4,27 +4,35 @@ - + - + - + - + - + - + + + + + + + + + diff --git a/ServerTest/packages.config b/ServerTest/packages.config index 533a955..b659cda 100644 --- a/ServerTest/packages.config +++ b/ServerTest/packages.config @@ -1,11 +1,11 @@  - + - - - - - + + + + + \ No newline at end of file