From 65ca00cf04e53cc475c59e8093cd1e8e161389ef Mon Sep 17 00:00:00 2001 From: "Jeremy D. Miller" Date: Mon, 18 Nov 2024 13:45:31 -0600 Subject: [PATCH] Adding .NET 9 Support. Bumps to 3.3 --- .github/workflows/docs.yml | 5 +++++ .github/workflows/dotnet.yml | 5 +++++ .github/workflows/publish_nugets.yml | 5 +++++ Directory.Build.props | 4 ++-- ...multi_tenancy_detection_and_integration.cs | 3 ++- .../WolverineWebApi/WolverineWebApi.csproj | 5 +++++ .../EfCoreTests/EfCoreTests.csproj | 5 +++++ .../PersistenceTests/PersistenceTests.csproj | 5 +++++ .../Wolverine.EntityFrameworkCore.csproj | 5 +++++ .../Wolverine.Marten/Wolverine.Marten.csproj | 2 +- .../Wolverine.Postgresql.csproj | 2 +- .../Wolverine.RDBMS/Wolverine.RDBMS.csproj | 4 ++-- .../Wolverine.SqlServer.csproj | 2 +- src/Wolverine/Wolverine.csproj | 22 ++++++++++++++----- 14 files changed, 61 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7e9fcb289..68fd1721c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -23,6 +23,11 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 8.0.x + + - name: Setup .NET 9 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 9.0.x - name: Install Node.js uses: actions/setup-node@v1 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6e42fa6eb..4da75074b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -27,6 +27,11 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 8.0.x + + - name: Setup .NET 9 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 9.0.x - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/publish_nugets.yml b/.github/workflows/publish_nugets.yml index b984fbc3f..3a393f62e 100644 --- a/.github/workflows/publish_nugets.yml +++ b/.github/workflows/publish_nugets.yml @@ -23,6 +23,11 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 8.0.x + + - name: Setup .NET 9 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 9.0.x - name: Run Pack run: ./build.sh --no-color pack diff --git a/Directory.Build.props b/Directory.Build.props index c6ab87703..056c67ffe 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,11 +7,11 @@ https://github.com/JasperFx/wolverine/blob/main/docs/public/logo.png?raw=true http://github.com/jasperfx/wolverine MIT - net7.0;net8.0 + net7.0;net8.0;net9.0 1570;1571;1572;1573;1574;1587;1591;1701;1702;1711;1735;0618 true enable - 3.2.0 + 3.3.0 $(PackageProjectUrl) true true diff --git a/src/Http/Wolverine.Http.Tests/multi_tenancy_detection_and_integration.cs b/src/Http/Wolverine.Http.Tests/multi_tenancy_detection_and_integration.cs index be38c5ff3..9bcc02990 100644 --- a/src/Http/Wolverine.Http.Tests/multi_tenancy_detection_and_integration.cs +++ b/src/Http/Wolverine.Http.Tests/multi_tenancy_detection_and_integration.cs @@ -357,7 +357,8 @@ public async Task does_tag_current_activity_with_tenant_id() x.WithRequestHeader("tenant", "green"); }); - var activity = result.Context.Features.Get()?.Activity; + var feature = result.Context.Features.Get(); + var activity = feature?.Activity; activity.ShouldNotBeNull(); activity.Tags.ShouldContain(x => x.Key == "tenant.id" && x.Value == "green"); } diff --git a/src/Http/WolverineWebApi/WolverineWebApi.csproj b/src/Http/WolverineWebApi/WolverineWebApi.csproj index 21521b7d2..53a495f72 100644 --- a/src/Http/WolverineWebApi/WolverineWebApi.csproj +++ b/src/Http/WolverineWebApi/WolverineWebApi.csproj @@ -28,6 +28,11 @@ + + + + + Servers.cs diff --git a/src/Persistence/EfCoreTests/EfCoreTests.csproj b/src/Persistence/EfCoreTests/EfCoreTests.csproj index 80b6159fd..19b470684 100644 --- a/src/Persistence/EfCoreTests/EfCoreTests.csproj +++ b/src/Persistence/EfCoreTests/EfCoreTests.csproj @@ -29,6 +29,11 @@ + + + + + diff --git a/src/Persistence/PersistenceTests/PersistenceTests.csproj b/src/Persistence/PersistenceTests/PersistenceTests.csproj index defe64573..b8c171008 100644 --- a/src/Persistence/PersistenceTests/PersistenceTests.csproj +++ b/src/Persistence/PersistenceTests/PersistenceTests.csproj @@ -38,6 +38,11 @@ + + + + + diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj b/src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj index ef7531b42..d70f09792 100644 --- a/src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj +++ b/src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj @@ -25,6 +25,11 @@ + + + + + diff --git a/src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj b/src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj index d0e846bb0..14ce4133a 100644 --- a/src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj +++ b/src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj b/src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj index 04e959329..857bf28cf 100644 --- a/src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj +++ b/src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj b/src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj index fda4d95b3..9e4a31567 100644 --- a/src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj +++ b/src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj b/src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj index 9cb6bba94..bc78a5f25 100644 --- a/src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj +++ b/src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Wolverine/Wolverine.csproj b/src/Wolverine/Wolverine.csproj index e297b7098..cd0e3f0c3 100644 --- a/src/Wolverine/Wolverine.csproj +++ b/src/Wolverine/Wolverine.csproj @@ -4,20 +4,32 @@ WolverineFx - + - + - - - + + + + + + + + + + + + + + +