Skip to content

.net10 build #4392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gmriggs wants to merge 20 commits into
base: master
Choose a base branch
from
Open

.net10 build #4392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4c71c69
.net10 build
gmriggs Nov 11, 2025
c85f292
update appveyor version
gmriggs Nov 11, 2025
b1d4a51
update appveyor vs version
gmriggs Nov 11, 2025
fa18329
Update appveyor.yml
LtRipley36706 Nov 11, 2025
12e6f3a
Merge branch 'master' into net10
gmriggs Nov 29, 2025
00e9a27
Merge remote-tracking branch 'upstream/master' into pr/4392
LtRipley36706 Jan 3, 2026
0718e04
Update ACE.Server.csproj
LtRipley36706 Jan 3, 2026
f5bf6bd
Update PacketHeaderOptional.cs
LtRipley36706 Jan 3, 2026
4a053a4
Update .vsconfig
LtRipley36706 Jan 3, 2026
65886d7
Update ACE.Adapter.csproj
LtRipley36706 Jan 3, 2026
b479a1f
Update ACE.Common.csproj
LtRipley36706 Jan 3, 2026
58da58b
Update ACE.Database.Tests.csproj
LtRipley36706 Jan 3, 2026
9af4322
Update ACE.Database.csproj
LtRipley36706 Jan 3, 2026
8accf78
Update ACE.DatLoader.Tests.csproj
LtRipley36706 Jan 3, 2026
122429d
Update ACE.DatLoader.csproj
LtRipley36706 Jan 3, 2026
1c84223
Update ACE.Entity.csproj
LtRipley36706 Jan 3, 2026
3399585
Update ACE.Server.Tests.csproj
LtRipley36706 Jan 3, 2026
0bea80c
Update ACE.Server.csproj
LtRipley36706 Jan 3, 2026
f63540e
Update ACE.Database.csproj
LtRipley36706 Jan 3, 2026
0a89151
Merge branch 'net10' of https://github.com/gmriggs/ACE into net10
gmriggs Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AppVeyor/AppVeyorInstall.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Source/.vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": []
}
}
8 changes: 2 additions & 6 deletions Source/ACE.Adapter/ACE.Adapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -34,8 +34,4 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.6" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Source/ACE.Common/ACE.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>

Expand All @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions Source/ACE.DatLoader/ACE.DatLoader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Source/ACE.Database.Tests/ACE.Database.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>

Expand All @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions Source/ACE.Database/ACE.Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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.11" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/ACE.Entity/ACE.Entity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Source/ACE.Server.Tests/ACE.Server.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>

Expand All @@ -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>

Expand Down
5 changes: 2 additions & 3 deletions Source/ACE.Server/ACE.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Platforms>x64</Platforms>
</PropertyGroup>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Source/ACE.Server/Command/Handlers/AdminCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion Source/ACE.Server/Network/PacketHeaderOptional.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down