Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ HermesProxy/CSV/BroadcastTexts3.csv text eol=lf

# Run by bash on Windows too, where a CRLF checkout would break it.
scripts/docker-smoke.sh text eol=lf

# Verify 32 fails a snapshot that holds a CR, which is what core.autocrlf=true checks out.
*.verified.txt text eol=lf
8 changes: 1 addition & 7 deletions .github/workflows/Build_Proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@ concurrency:
cancel-in-progress: true

env:
# Multi-SDK: 10.0.x covers master (targets net10.0). The pinned 11.0
# preview is available for branches like feature/dotnet11 that target
# net11.0 — without it, setup-dotnet@10.0.x fails with NETSDK1045.
# Bump the preview pin when a newer preview becomes the local baseline.
DOTNET_VERSION: |
10.0.x
11.0.100-preview.3.26207.106
DOTNET_VERSION: 11.0.x
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true

Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/PreRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,7 @@ concurrency:
cancel-in-progress: true

env:
# Multi-SDK: 10.0.x covers master (targets net10.0). The pinned 11.0
# preview is available for branches like feature/dotnet11 that target
# net11.0 — without it, setup-dotnet@10.0.x fails with NETSDK1045.
# Bump the preview pin when a newer preview becomes the local baseline.
DOTNET_VERSION: |
10.0.x
11.0.100-preview.3.26207.106
DOTNET_VERSION: 11.0.x
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true

Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@ permissions:
contents: read

env:
# Multi-SDK: 10.0.x covers master (targets net10.0). The pinned 11.0
# preview is available for branches like feature/dotnet11 that target
# net11.0 — without it, setup-dotnet@10.0.x fails with NETSDK1045.
# Bump the preview pin when a newer preview becomes the local baseline.
DOTNET_VERSION: |
10.0.x
11.0.100-preview.3.26207.106
DOTNET_VERSION: 11.0.x
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true

Expand Down
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ session). Then repeat the action in game.

## Target Framework & Global Settings

- **.NET 10.0** — set centrally in `Directory.Packages.props`
- **.NET 11.0** — set centrally in `Directory.Packages.props`
- **Central package management** — all versions in `Directory.Packages.props`; projects use `<PackageReference>` without version attributes
- **Nullable** enabled solution-wide
- **Global using**: `System.Numerics`
Expand Down
45 changes: 24 additions & 21 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
<!-- SYSLIB1015: "argument is not referenced from the logging message". Every [LoggerMessage]
Expand All @@ -16,45 +16,48 @@
</ItemGroup>
<ItemGroup>
<!-- Framework project packages -->
<PackageVersion Include="Google.Protobuf" Version="3.36.1" />
<PackageVersion Include="Google.Protobuf" Version="3.36.2" />
<!-- Build-time only: bundles protoc (35.1). Generated code must not be newer than the runtime above.
Prerelease for its universal macOS protoc: 2.83.0 ships x86_64 only, which cannot run on Apple
Silicon without Rosetta (MSB6003). Move to 2.84.0 once it is stable. -->
<PackageVersion Include="Grpc.Tools" Version="2.84.0-pre1" />
<PackageVersion Include="Sep" Version="0.12.2" />
Not below 2.84: 2.83.0 ships an x86_64-only macOS protoc, which cannot run on Apple Silicon
without Rosetta (MSB6003). -->
<PackageVersion Include="Grpc.Tools" Version="2.85.0" />
<PackageVersion Include="Sep" Version="0.17.1" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<!-- Logging -->
<PackageVersion Include="Serilog" Version="4.3.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog" Version="4.4.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
<!-- Hosting / DI / Options -->
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="11.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="11.0.0" />
<!-- HermesProxy project packages -->
<PackageVersion Include="GitVersion.MsBuild" Version="6.5.1" />
<PackageVersion Include="GitVersion.MsBuild" Version="6.8.2" />
<!-- BouncyCastle — two consumers:
1. Ed25519ctx signer for SMSG_ENTER_ENCRYPTED_MODE on WotLK Classic 3.4.3+ clients,
which switched from RSA to Ed25519 signatures. .NET's built-in crypto doesn't
expose the RFC 8032 "Ed25519ctx" context variant.
2. AES-GCM fallback in Framework.Cryptography.WorldCrypt for platforms where
System.Security.Cryptography.AesGcm rejects the 12-byte (96-bit) tag the WoW
protocol uses (notably macOS / Apple's CommonCrypto backend). -->
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.7.0" />
<!-- Test packages -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.11.1" />
<!-- Held at the last 3.x: xunit.v3 4 brings Microsoft.Testing.Platform 2, which fails
`dotnet test` in VSTest mode. Moving means opting in through global.json and rewriting
every `filter` argument in CI, the docs and the scripts. -->
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Verify.XunitV3" Version="29.0.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.10.0" />
<PackageVersion Include="coverlet.collector" Version="10.1.0" />
<PackageVersion Include="Moq" Version="4.21.0" />
<!-- Held at the last 32.x: from 33.0.0 the build fails (SC021) until a sponsorship or an
exemption is declared in MSBuild, and an exemption runs out after at most 12 months. -->
<PackageVersion Include="Verify.XunitV3" Version="32.0.1" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.11.0" />
<!-- Benchmark packages -->
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<!-- Source generator packages -->
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# from a full clone with BuildKit: GitVersion needs the history, and $BUILDPLATFORM needs BuildKit.
ARG BINARIES=from-source

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-noble AS from-source
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:11.0-resolute AS from-source
ARG TARGETARCH
WORKDIR /src
COPY .git .git
Expand All @@ -25,7 +25,7 @@ WORKDIR /state/Logs
WORKDIR /state/AccountData
WORKDIR /state/PacketsLog

FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble-chiseled
FROM mcr.microsoft.com/dotnet/runtime-deps:11.0-resolute-chiseled
WORKDIR /app
COPY --from=published /app .
COPY --from=state --chown=$APP_UID:$APP_UID /state .
Expand Down
2 changes: 0 additions & 2 deletions Framework/Framework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="BouncyCastle.Cryptography" />
<PackageReference Include="Grpc.Tools">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion HermesProxy.Tests/CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dotnet test --filter "ClassName" # Filter by class or method name
## Test Framework

- **xunit.v3 3.2.2** — test runner (supports `Assert.Skip` / `Assert.SkipUnless` / `Assert.SkipWhen` natively)
- **Moq 4.20.72** — mocking
- **Moq 4.21.0** — mocking
- **coverlet.collector** — code coverage

## Organization
Expand Down
2 changes: 1 addition & 1 deletion HermesProxy.Tests/World/GameDataCsvLoadTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace HermesProxy.Tests.World;
/// Run it on its own after building, e.g. for the 4.4.2 set:
/// <code>
/// HERMES_TEST_CSV_LOAD=1 HERMES_TEST_MODERN_BUILD=V4_4_2_60895 \
/// dotnet HermesProxy.Tests/bin/Debug/net10.0/HermesProxy.Tests.dll \
/// dotnet HermesProxy.Tests/bin/Debug/net11.0/HermesProxy.Tests.dll \
/// --filter-class HermesProxy.Tests.World.GameDataCsvLoadTests
/// </code>
/// See HermesProxy/CSV/README.md.
Expand Down
2 changes: 1 addition & 1 deletion HermesProxy.Tests/World/Movement/run-version-matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set -u
cd "$(dirname "$0")/../../.." || exit 1

config="${1:-Debug}"
dll="HermesProxy.Tests/bin/$config/net10.0/HermesProxy.Tests.dll"
dll="HermesProxy.Tests/bin/$config/net11.0/HermesProxy.Tests.dll"

dotnet build HermesProxy.Tests -c "$config" -v q --nologo || exit 1

Expand Down
2 changes: 1 addition & 1 deletion HermesProxy/CSV/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Then load the set through the proxy's own loaders, for the build it is for:
```bash
dotnet build
HERMES_TEST_CSV_LOAD=1 HERMES_TEST_MODERN_BUILD=V4_4_2_60895 \
dotnet HermesProxy.Tests/bin/Debug/net10.0/HermesProxy.Tests.dll \
dotnet HermesProxy.Tests/bin/Debug/net11.0/HermesProxy.Tests.dll \
--filter-class HermesProxy.Tests.World.GameDataCsvLoadTests
```

Expand Down
Loading