Adding .NET 9 Support. Bumps to 3.3

JasperFx · Nov 18, 2024 · 65ca00c · 65ca00c
1 parent 2420c0b
commit 65ca00c
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -7,11 +7,11 @@
         <PackageIconUrl>https://github.com/JasperFx/wolverine/blob/main/docs/public/logo.png?raw=true</PackageIconUrl>
         <PackageProjectUrl>http://github.com/jasperfx/wolverine</PackageProjectUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
         <NoWarn>1570;1571;1572;1573;1574;1587;1591;1701;1702;1711;1735;0618</NoWarn>
         <ImplicitUsings>true</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <VersionPrefix>3.2.0</VersionPrefix>
+        <VersionPrefix>3.3.0</VersionPrefix>
         <RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

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
@@ -357,7 +357,8 @@ public async Task does_tag_current_activity_with_tenant_id()
             x.WithRequestHeader("tenant", "green");
         });
 
-        var activity = result.Context.Features.Get<IHttpActivityFeature>()?.Activity;
+        var feature = result.Context.Features.Get<IHttpActivityFeature>();
+        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
@@ -28,6 +28,11 @@
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(targetframework)' == 'net9.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <Compile Include="..\..\Servers.cs">
             <Link>Servers.cs</Link>

diff --git a/src/Persistence/EfCoreTests/EfCoreTests.csproj b/src/Persistence/EfCoreTests/EfCoreTests.csproj
@@ -29,6 +29,11 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0"/>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(targetframework)' == 'net9.0'">
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0"/>
+    </ItemGroup>
+
 
     <ItemGroup>
         <Compile Include="..\..\Servers.cs">

diff --git a/src/Persistence/PersistenceTests/PersistenceTests.csproj b/src/Persistence/PersistenceTests/PersistenceTests.csproj
@@ -38,6 +38,11 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0"/>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(targetframework)' == 'net9.0'">
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0"/>
+    </ItemGroup>
+
     <ItemGroup>
         <Content Include="$(SolutionDir)xunit.runner.json" CopyToOutputDirectory="PreserveNewest"/>
     </ItemGroup>

diff --git a/src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj b/src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj
@@ -25,6 +25,11 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0"/>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0"/>
+    </ItemGroup>
+
     <ItemGroup>
         <Folder Include="obj\Debug\netstandard2.1"/>
     </ItemGroup>

diff --git a/src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj b/src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj
@@ -12,7 +12,7 @@
         <ProjectReference Include="..\Wolverine.Postgresql\Wolverine.Postgresql.csproj"/>
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Marten.CommandLine" Version="7.27.0" />
+      <PackageReference Include="Marten.CommandLine" Version="7.32.0" />
     </ItemGroup>
     <ItemGroup>
       <Compile Remove="CritterStackHostBuilder.cs" />

diff --git a/src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj b/src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj
@@ -16,7 +16,7 @@
 
     <ItemGroup>
         <PackageReference Include="Npgsql" Version="8.0.3" />
-        <PackageReference Include="Weasel.Postgresql" Version="7.11.4" />
+        <PackageReference Include="Weasel.Postgresql" Version="7.12.0" />
     </ItemGroup>
 
     <Import Project="../../../Analysis.Build.props"/>

diff --git a/src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj b/src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj
@@ -15,8 +15,8 @@
 
     <ItemGroup>
         <PackageReference Include="System.Data.Common" Version="4.3.0"/>
-        <PackageReference Include="Weasel.CommandLine" Version="7.11.4"/>
-        <PackageReference Include="Weasel.Core" Version="7.11.4"/>
+        <PackageReference Include="Weasel.CommandLine" Version="7.12.0"/>
+        <PackageReference Include="Weasel.Core" Version="7.12.0"/>
     </ItemGroup>
 
     <Import Project="../../../Analysis.Build.props"/>

diff --git a/src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj b/src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj
@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Weasel.SqlServer" Version="7.11.4"/>
+        <PackageReference Include="Weasel.SqlServer" Version="7.12.0"/>
     </ItemGroup>
 
     <Import Project="../../../Analysis.Build.props"/>

diff --git a/src/Wolverine/Wolverine.csproj b/src/Wolverine/Wolverine.csproj
@@ -4,20 +4,32 @@
         <PackageId>WolverineFx</PackageId>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="FastExpressionCompiler" Version="4.2.1" />
+        <PackageReference Include="FastExpressionCompiler" Version="4.2.2" />
         <PackageReference Include="NewId" Version="4.0.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Oakton" Version="6.2.1" />
+        <PackageReference Include="Oakton" Version="6.3.0" />
         <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
         <PackageReference Include="System.ComponentModel" Version="4.3.0" />
-        <PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.6.0" />
-        <PackageReference Include="JasperFx.RuntimeCompiler" Version="3.6.0" />
-        <PackageReference Include="JasperFx.Core" Version="1.8.0" />
+        <PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.7.1" />
+        <PackageReference Include="JasperFx.RuntimeCompiler" Version="3.7.1" />
+        <PackageReference Include="JasperFx.Core" Version="1.9.0" />
     </ItemGroup>
 
     <Import Project="../../Analysis.Build.props"/>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="[9.0.0,10.0.0)"/>
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="[9.0.0,10.0.0)"/>
+    </ItemGroup>
+
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="[8.0.0,9.0.0)"/>
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[8.0.0,9.0.0)"/>