diff --git a/AppVeyor/AppVeyorInstall.ps1 b/AppVeyor/AppVeyorInstall.ps1
index c8f3fdf69d..b1578754b2 100644
--- a/AppVeyor/AppVeyorInstall.ps1
+++ b/AppVeyor/AppVeyorInstall.ps1
@@ -1,2 +1,2 @@
Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
-& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet"
+& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
diff --git a/Source/.vsconfig b/Source/.vsconfig
index c14058c12e..386ce146f3 100644
--- a/Source/.vsconfig
+++ b/Source/.vsconfig
@@ -14,6 +14,7 @@
"Microsoft.VisualStudio.Component.SQL.CLR",
"Microsoft.Component.ClickOnce",
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
+ "Microsoft.NetCore.Component.Runtime.10.0",
"Microsoft.NetCore.Component.Runtime.8.0",
"Microsoft.NetCore.Component.SDK",
"Microsoft.VisualStudio.Component.FSharp",
@@ -25,11 +26,10 @@
"Microsoft.VisualStudio.Component.EntityFramework",
"Microsoft.VisualStudio.Component.Debugger.JustInTime",
"Microsoft.VisualStudio.Component.IntelliCode",
- "Microsoft.NetCore.Component.Runtime.6.0",
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
"Microsoft.ComponentGroup.Blend",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Component.Git"
],
"extensions": []
-}
\ No newline at end of file
+}
diff --git a/Source/ACE.Adapter/ACE.Adapter.csproj b/Source/ACE.Adapter/ACE.Adapter.csproj
index 0df7fe891f..3a421759f8 100644
--- a/Source/ACE.Adapter/ACE.Adapter.csproj
+++ b/Source/ACE.Adapter/ACE.Adapter.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net10.0
disable
disable
AnyCPU
@@ -9,7 +9,7 @@
ACEmulator Contributors
ACEmulator
Asheron's Call server emulator
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
https://emulator.ac
https://github.com/ACEmulator/ACE
@@ -34,8 +34,4 @@
-
-
-
-
diff --git a/Source/ACE.Common/ACE.Common.csproj b/Source/ACE.Common/ACE.Common.csproj
index dcd8fd2152..b14e927ea5 100644
--- a/Source/ACE.Common/ACE.Common.csproj
+++ b/Source/ACE.Common/ACE.Common.csproj
@@ -7,7 +7,7 @@
git
https://github.com/ACEmulator/ACE
https://emulator.ac
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
Asheron's Call server emulator
ACEmulator
@@ -16,7 +16,7 @@
-
+
diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj
index 64e1bbd4f1..23e5ab0dcb 100644
--- a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj
+++ b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net10.0
false
@@ -13,7 +13,7 @@
Asheron's Call server emulator
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj
index 0b934433af..06a6d413d6 100644
--- a/Source/ACE.DatLoader/ACE.DatLoader.csproj
+++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj
@@ -7,7 +7,7 @@
git
https://github.com/ACEmulator/ACE
https://emulator.ac
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
Asheron's Call server emulator
ACEmulator
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj
index 92445a859f..c022f50ed9 100644
--- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj
+++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net10.0
false
@@ -13,7 +13,7 @@
Asheron's Call server emulator
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj
index c2d61aab1c..3e9551d94a 100644
--- a/Source/ACE.Database/ACE.Database.csproj
+++ b/Source/ACE.Database/ACE.Database.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net10.0
disable
disable
AnyCPU
@@ -9,7 +9,7 @@
git
https://github.com/ACEmulator/ACE
https://emulator.ac
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
Asheron's Call server emulator
ACEmulator
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/Source/ACE.Entity/ACE.Entity.csproj b/Source/ACE.Entity/ACE.Entity.csproj
index 405e31dcb1..2e4eb67131 100644
--- a/Source/ACE.Entity/ACE.Entity.csproj
+++ b/Source/ACE.Entity/ACE.Entity.csproj
@@ -7,7 +7,7 @@
git
https://github.com/ACEmulator/ACE
https://emulator.ac
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
Asheron's Call server emulator
ACEmulator
diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj
index f87b83b011..30a7972681 100644
--- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj
+++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net10.0
false
@@ -13,7 +13,7 @@
Asheron's Call server emulator
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj
index 9fbd892764..4a9089059f 100644
--- a/Source/ACE.Server/ACE.Server.csproj
+++ b/Source/ACE.Server/ACE.Server.csproj
@@ -2,7 +2,7 @@
Exe
- net8.0
+ net10.0
x64
@@ -23,7 +23,7 @@
git
https://github.com/ACEmulator/ACE
https://emulator.ac
- © 2017-2024 ACEmulator Team and Contributors
+ © 2017-2026 ACEmulator Team and Contributors
LICENSE
Asheron's Call server emulator
ACEmulator
@@ -240,7 +240,6 @@
-
diff --git a/Source/ACE.Server/Command/Handlers/AdminCommands.cs b/Source/ACE.Server/Command/Handlers/AdminCommands.cs
index 16ce7ab0cf..2e6788099e 100644
--- a/Source/ACE.Server/Command/Handlers/AdminCommands.cs
+++ b/Source/ACE.Server/Command/Handlers/AdminCommands.cs
@@ -2576,7 +2576,7 @@ public static void HandleCrack(Session session, params string[] parameters)
{
var objectId = new ObjectGuid((uint)session.Player.CurrentAppraisalTarget);
var wo = session.Player.CurrentLandblock?.GetObject(objectId);
- if (wo is Lock @lock)
+ if (wo is ACE.Server.WorldObjects.Lock @lock)
{
var opening = openIt ? $" Opening {wo.WeenieType}." : "";
string lockCode = LockHelper.GetLockCode(wo);
diff --git a/Source/ACE.Server/Network/PacketHeaderOptional.cs b/Source/ACE.Server/Network/PacketHeaderOptional.cs
index 61cd182115..46cd2c462d 100644
--- a/Source/ACE.Server/Network/PacketHeaderOptional.cs
+++ b/Source/ACE.Server/Network/PacketHeaderOptional.cs
@@ -72,7 +72,8 @@ public void Unpack(BinaryReader reader, PacketHeader header)
long length = reader.BaseStream.Length - position;
if (length < 1) { IsValid = false; return; }
byte[] loginBytes = new byte[length];
- reader.BaseStream.Read(loginBytes, (int)position, (int)length);
+ var i = reader.BaseStream.Read(loginBytes, (int)position, (int)length);
+ if (i != length) { IsValid = false; return; }
writer.Write(loginBytes);
reader.BaseStream.Position = position;
}
diff --git a/appveyor.yml b/appveyor.yml
index e89fce0b64..d103b362ca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -46,8 +46,8 @@ environment:
secure: lGLpqex+Weod6ZiPw34RwTv999QvoSZ+imTcmYhiJWQL6XkfkVUYcqOO6pJDuAYt
services:
- mysql
-#install:
-# - ps: AppVeyor\AppVeyorInstall.ps1
+install:
+ - ps: AppVeyor\AppVeyorInstall.ps1
before_build:
- cmd: AppVeyor\AppVeyorBeforeCompile.bat
build: