.net10 build

AppVeyor/AppVeyorBuild.bat

@@ -0,0 +1,3 @@
+@echo on
+msbuild "C:\projects\ace\Source\ACE.sln" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:NoWarn="NETSDK1233"
+AppVeyor\AppVeyorBeforePackage.bat

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"

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
 ARG TARGETARCH
 WORKDIR /Source
 
@@ -21,7 +21,7 @@ COPY . ../.
 RUN dotnet publish ./ACE.Server/ACE.Server.csproj -a $TARGETARCH -c release -o /ace --no-restore
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy
+FROM mcr.microsoft.com/dotnet/runtime:10.0-noble
 ARG DEBIAN_FRONTEND="noninteractive"
 WORKDIR /ace
 

README.md

@@ -39,10 +39,3 @@ Please note that this project is released with a [Contributor Code of Conduct](h
 
 ## Contact
 * [Discord Channel](https://discord.gg/C2WzhP9)
-
-## Database Management Scripts
-Database export and rebase utilities are located in `Database/tools`.
-Windows users can run the existing `*.bat` files, while Linux/macOS users can use
-the new `*.sh` equivalents such as `ExportShardBase.sh` and
-`RebaseWorldBase.sh`. These scripts call `mysqldump` and `mysql` from the
-standard system paths.

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": []
-}
+}

Source/ACE.Adapter/ACE.Adapter.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>disable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
         <Platforms>AnyCPU</Platforms>
         <Version>1.0.0</Version>
         <Authors>ACEmulator Contributors</Authors>
         <Company>ACEmulator</Company>
         <Description>Asheron's Call server emulator</Description>
-        <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+        <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <PackageProjectUrl>https://emulator.ac</PackageProjectUrl>
         <RepositoryUrl>https://github.com/ACEmulator/ACE</RepositoryUrl>
@@ -34,8 +34,4 @@
       </None>
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="System.Text.Json" Version="8.0.6" />
-    </ItemGroup>
-
 </Project>

Source/ACE.Common/ACE.Common.csproj

@@ -7,7 +7,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ACEmulator/ACE</RepositoryUrl>
     <PackageProjectUrl>https://emulator.ac</PackageProjectUrl>
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>Asheron's Call server emulator</Description>
     <Company>ACEmulator</Company>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
-    <PackageReference Include="System.Text.Json" Version="8.0.6" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
   </ItemGroup>
 
     <ItemGroup>

Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -13,7 +13,7 @@
 
     <Description>Asheron's Call server emulator</Description>
 
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
 
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
 
@@ -28,8 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ACE.DatLoader/ACE.DatLoader.csproj

@@ -7,7 +7,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ACEmulator/ACE</RepositoryUrl>
     <PackageProjectUrl>https://emulator.ac</PackageProjectUrl>
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>Asheron's Call server emulator</Description>
     <Company>ACEmulator</Company>
@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.17" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.22" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="10.0.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>

Source/ACE.Database.Tests/ACE.Database.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -13,7 +13,7 @@
 
     <Description>Asheron's Call server emulator</Description>
 
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
 
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
 
@@ -29,8 +29,8 @@
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ACE.Database/ACE.Database.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>disable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
     <Platforms>AnyCPU</Platforms>
     <Authors>ACEmulator Contributors</Authors>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ACEmulator/ACE</RepositoryUrl>
     <PackageProjectUrl>https://emulator.ac</PackageProjectUrl>
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>Asheron's Call server emulator</Description>
     <Company>ACEmulator</Company>
@@ -18,8 +18,8 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.13" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ACE.Entity/ACE.Entity.csproj

@@ -7,7 +7,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ACEmulator/ACE</RepositoryUrl>
     <PackageProjectUrl>https://emulator.ac</PackageProjectUrl>
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>Asheron's Call server emulator</Description>
     <Company>ACEmulator</Company>

Source/ACE.Server.Tests/ACE.Server.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -13,7 +13,7 @@
 
     <Description>Asheron's Call server emulator</Description>
 
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
 
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
 
@@ -29,8 +29,8 @@
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ACE.Server.Tests/Physics/SphereTests.cs

@@ -4,8 +4,6 @@
 using ACE.Server.Physics.Animation;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-[assembly: Parallelize]
-
 namespace ACE.Server.Tests.Physics
 {
     [TestClass]

Source/ACE.Server/ACE.Server.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 
@@ -23,7 +23,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ACEmulator/ACE</RepositoryUrl>
     <PackageProjectUrl>https://emulator.ac</PackageProjectUrl>
-    <Copyright>© 2017-2024 ACEmulator Team and Contributors</Copyright>
+    <Copyright>© 2017-2026 ACEmulator Team and Contributors</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>Asheron's Call server emulator</Description>
     <Company>ACEmulator</Company>
@@ -240,7 +240,6 @@
     <PackageReference Include="Log4Net.Async.Standard" Version="3.1.0" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
     <PackageReference Include="MySqlConnector" Version="2.5.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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);

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;
             }

Source/ACE.sln

@@ -23,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppVeyor", "AppVeyor", "{27
 		..\AppVeyor\AppVeyorAfterDeploy.bat = ..\AppVeyor\AppVeyorAfterDeploy.bat
 		..\AppVeyor\AppVeyorBeforeCompile.bat = ..\AppVeyor\AppVeyorBeforeCompile.bat
 		..\AppVeyor\AppVeyorBeforePackage.bat = ..\AppVeyor\AppVeyorBeforePackage.bat
+		..\AppVeyor\AppVeyorBuild.bat = ..\AppVeyor\AppVeyorBuild.bat
+		..\AppVeyor\AppVeyorInstall.ps1 = ..\AppVeyor\AppVeyorInstall.ps1
 		..\AppVeyor\AppVeyorTestScript.bat = ..\AppVeyor\AppVeyorTestScript.bat
 		..\AppVeyor\Config.js = ..\AppVeyor\Config.js
 		..\AppVeyor\DownloadACEWorld.bat = ..\AppVeyor\DownloadACEWorld.bat

appveyor.yml

@@ -46,17 +46,19 @@ environment:
     secure: lGLpqex+Weod6ZiPw34RwTv999QvoSZ+imTcmYhiJWQL6XkfkVUYcqOO6pJDuAYt
 services:
   - mysql
-#install:
-#  - ps: AppVeyor\AppVeyorInstall.ps1
+install:
+  - ps: AppVeyor\AppVeyorInstall.ps1
 before_build:
 - cmd: AppVeyor\AppVeyorBeforeCompile.bat
-build:
-  project: Source\ACE.sln
-  verbosity: minimal
-before_package:
-- cmd: AppVeyor\AppVeyorBeforePackage.bat
+#build:
+#  project: Source\ACE.sln
+#  verbosity: minimal
+build_script:
+- cmd: AppVeyor\AppVeyorBuild.bat
 after_build:
 - cmd: AppVeyor\AppVeyorAfterCompile.bat
+#before_package:
+#- cmd: AppVeyor\AppVeyorBeforePackage.bat
 test_script:
 - cmd: AppVeyor\AppVeyorTestScript.bat
 artifacts: