From cee5553dcab6ce894724ab4d42b5a659ac65f504 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 10 Nov 2026 18:46:44 -0800 Subject: [PATCH] chore: target .NET 10 and .NET 11 for the schema tool (v4.4.0) ModernUOSchemaGenerator was net10.0 only, so it could not launch on a machine with only the .NET 11 runtime. The tool package now carries tools/net10.0 and tools/net11.0 and dotnet picks the matching one. The generator and annotations stay netstandard2.0; they are bumped to 4.4.0 to keep the three packages versioned together. The tests run on both frameworks, and CI installs both SDKs. Publishing uses .NET 11. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 4 +++- .../ModernUO.Serialization.Annotations.csproj | 4 ++-- .../ModernUO.Serialization.Generator.Tests.csproj | 2 +- .../ModernUO.Serialization.Generator.csproj | 4 ++-- .../ModernUO.Serialization.SchemaGenerator.csproj | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9577684..befe677 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/setup-dotnet@v6 with: - dotnet-version: '10.0.x' + dotnet-version: '11.0.x' # GeneratePackageOnBuild=true makes pack skip its build, packing an empty bin/ on a clean runner. # Pack before logging in: the temporary key expires after an hour. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f410d53..96e457a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,9 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '10.0.x' + dotnet-version: | + 10.0.x + 11.0.x - name: Restore dependencies run: dotnet restore diff --git a/ModernUO.Serialization.Annotations/ModernUO.Serialization.Annotations.csproj b/ModernUO.Serialization.Annotations/ModernUO.Serialization.Annotations.csproj index e127dbd..f14e836 100644 --- a/ModernUO.Serialization.Annotations/ModernUO.Serialization.Annotations.csproj +++ b/ModernUO.Serialization.Annotations/ModernUO.Serialization.Annotations.csproj @@ -4,8 +4,8 @@ ModernUO.Serialization.Annotations netstandard2.0 preview - 4.3.0 - 4.3.0 + 4.4.0 + 4.4.0 ModernUO.Serialization.Annotations ModernUO.Serialization true diff --git a/ModernUO.Serialization.Generator.Tests/ModernUO.Serialization.Generator.Tests.csproj b/ModernUO.Serialization.Generator.Tests/ModernUO.Serialization.Generator.Tests.csproj index 6acae3c..713ab74 100644 --- a/ModernUO.Serialization.Generator.Tests/ModernUO.Serialization.Generator.Tests.csproj +++ b/ModernUO.Serialization.Generator.Tests/ModernUO.Serialization.Generator.Tests.csproj @@ -1,7 +1,7 @@ - net10.0 + net10.0;net11.0 preview enable enable diff --git a/ModernUO.Serialization.Generator/ModernUO.Serialization.Generator.csproj b/ModernUO.Serialization.Generator/ModernUO.Serialization.Generator.csproj index 41b305e..6b0b453 100755 --- a/ModernUO.Serialization.Generator/ModernUO.Serialization.Generator.csproj +++ b/ModernUO.Serialization.Generator/ModernUO.Serialization.Generator.csproj @@ -4,8 +4,8 @@ ModernUO.Serialization.Generator netstandard2.0 preview - 4.3.0 - 4.3.0 + 4.4.0 + 4.4.0 ModernUO.Serialization.Generator true false diff --git a/ModernUO.Serialization.SchemaGenerator/ModernUO.Serialization.SchemaGenerator.csproj b/ModernUO.Serialization.SchemaGenerator/ModernUO.Serialization.SchemaGenerator.csproj index 11cc681..30c5b99 100755 --- a/ModernUO.Serialization.SchemaGenerator/ModernUO.Serialization.SchemaGenerator.csproj +++ b/ModernUO.Serialization.SchemaGenerator/ModernUO.Serialization.SchemaGenerator.csproj @@ -2,12 +2,12 @@ Kamron Batman ModernUOSchemaGenerator - net10.0 + net10.0;net11.0 x64;arm64 preview Exe - 4.3.0 - 4.3.0 + 4.4.0 + 4.4.0 true ModernUOSchemaGenerator true