Wolverine libs can target .NET 8. Closes GH-636

JasperFx · Nov 21, 2023 · f28686a · f28686a
1 parent 68aa4a1
commit f28686a
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 52 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
         <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>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <NoWarn>1570;1571;1572;1573;1574;1587;1591;1701;1702;1711;1735;0618</NoWarn>
         <ImplicitUsings>true</ImplicitUsings>
         <Version>1.11.1</Version>

diff --git a/src/Extensions/Wolverine.FluentValidation.Tests/Wolverine.FluentValidation.Tests.csproj b/src/Extensions/Wolverine.FluentValidation.Tests/Wolverine.FluentValidation.Tests.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/src/Extensions/Wolverine.MemoryPack.Tests/Wolverine.MemoryPack.Tests.csproj b/src/Extensions/Wolverine.MemoryPack.Tests/Wolverine.MemoryPack.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/src/Extensions/Wolverine.MessagePack.Tests/Wolverine.MessagePack.Tests.csproj b/src/Extensions/Wolverine.MessagePack.Tests/Wolverine.MessagePack.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/src/Http/Wolverine.AdminApi/Wolverine.AdminApi.csproj b/src/Http/Wolverine.AdminApi/Wolverine.AdminApi.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Http/Wolverine.Http.FluentValidation/Wolverine.Http.FluentValidation.csproj b/src/Http/Wolverine.Http.FluentValidation/Wolverine.Http.FluentValidation.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Leave this be, needing to override the Directory defaults -->
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
         <Description>Fluent Validation middleware for Wolverine HTTP Endpoints</Description>
         <DebugType>portable</DebugType>

diff --git a/src/Http/Wolverine.Http.Marten/Wolverine.Http.Marten.csproj b/src/Http/Wolverine.Http.Marten/Wolverine.Http.Marten.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Leave this be, needing to override the Directory defaults -->
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
         <Description>Marten middleware and other helpers for Wolverine HTTP Endpoints</Description>
         <DebugType>portable</DebugType>

diff --git a/...Http/Wolverine.Http.Tests.DifferentAssembly/Wolverine.Http.Tests.DifferentAssembly.csproj b/...Http/Wolverine.Http.Tests.DifferentAssembly/Wolverine.Http.Tests.DifferentAssembly.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/src/Http/Wolverine.Http.Tests/Wolverine.Http.Tests.csproj b/src/Http/Wolverine.Http.Tests/Wolverine.Http.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/src/Http/Wolverine.Http/HttpChain.EndpointBuilder.cs b/src/Http/Wolverine.Http/HttpChain.EndpointBuilder.cs
@@ -57,14 +57,14 @@ public RouteEndpoint BuildEndpoint()
         if (ResourceType == null)
         {
             builder.RemoveStatusCodeResponse(200);
-            builder.Metadata.Add(new ProducesResponseTypeMetadata { StatusCode = 204, Type = null });
+            builder.Metadata.Add(new WolverineProducesResponseTypeMetadata { StatusCode = 204, Type = null });
         }
 
 
         // Set up OpenAPI data for ProblemDetails with status code 400 if not already exists
         if (Middleware.SelectMany(x => x.Creates).Any(x => x.VariableType == typeof(ProblemDetails)))
         {
-            if (!builder.Metadata.OfType<ProducesResponseTypeMetadata>()
+            if (!builder.Metadata.OfType<WolverineProducesResponseTypeMetadata>()
                     .Any(x => x.Type != null && x.Type.CanBeCastTo<ProblemDetails>()))
             {
                 builder.Metadata.Add(new ProducesProblemDetailsResponseTypeMetadata());

diff --git a/src/Http/Wolverine.Http/IHttpAware.cs b/src/Http/Wolverine.Http/IHttpAware.cs
@@ -90,7 +90,7 @@ public static void PopulateMetadata(MethodInfo method, EndpointBuilder builder)
         builder.RemoveStatusCodeResponse(200);
 
         var create = new MethodCall(method.DeclaringType!, method).Creates.FirstOrDefault()?.VariableType;
-        var metadata = new ProducesResponseTypeMetadata { Type = create, StatusCode = 201 };
+        var metadata = new WolverineProducesResponseTypeMetadata { Type = create, StatusCode = 201 };
         builder.Metadata.Add(metadata);
     }
 

diff --git a/...Resources/ProducesResponseTypeMetadata.cs → .../WolverineProducesResponseTypeMetadata.cs b/...Resources/ProducesResponseTypeMetadata.cs → .../WolverineProducesResponseTypeMetadata.cs
@@ -2,7 +2,7 @@
 
 namespace Wolverine.Http.Resources;
 
-internal class ProducesResponseTypeMetadata : IProducesResponseTypeMetadata
+internal class WolverineProducesResponseTypeMetadata : IProducesResponseTypeMetadata
 {
     public Type? Type { get; init; }
     public int StatusCode { get; init; }

diff --git a/src/Http/Wolverine.Http/Runtime/PublishingEndpoint.cs b/src/Http/Wolverine.Http/Runtime/PublishingEndpoint.cs
@@ -21,7 +21,7 @@ public static void Configure(HttpChain chain)
         chain.Metadata.Add(builder =>
         {
             // Adding and modifying data
-            builder.Metadata.Add(new ProducesResponseTypeMetadata { StatusCode = 202, Type = null });
+            builder.Metadata.Add(new WolverineProducesResponseTypeMetadata { StatusCode = 202, Type = null });
             builder.RemoveStatusCodeResponse(200);
         });
     }

diff --git a/src/Http/Wolverine.Http/Wolverine.Http.csproj b/src/Http/Wolverine.Http/Wolverine.Http.csproj
@@ -4,7 +4,7 @@
         <Description>High Performance ASP.Net Core HTTP endpoints using the Wolverine runtime</Description>
 
         <!-- Leave this be, needing to override the Directory defaults -->
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <DebugType>portable</DebugType>
         <PackageId>WolverineFx.Http</PackageId>
         <LangVersion>preview</LangVersion>

diff --git a/src/Http/WolverineWebApi/WolverineWebApi.csproj b/src/Http/WolverineWebApi/WolverineWebApi.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Leave this alone -->
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>

diff --git a/src/Persistence/PersistenceTests/Agents/Postgresql/leader_election.cs b/src/Persistence/PersistenceTests/Agents/Postgresql/leader_election.cs
@@ -324,7 +324,7 @@ await _originalHost.WaitUntilAssignmentsChangeTo(w =>
 
         var runtime2 = host2.GetRuntime();
         await host2.InvokeMessageAndWaitAsync(new CheckAgentHealth());
-        await runtime2.Tracker.WaitUntilAssumesLeadershipAsync(5.Seconds());
+        await runtime2.Tracker.WaitUntilAssumesLeadershipAsync(15.Seconds());
 
 
         await host2.WaitUntilAssignmentsChangeTo(w =>

diff --git a/src/Persistence/PersistenceTests/Agents/SqlServer/leader_election.cs b/src/Persistence/PersistenceTests/Agents/SqlServer/leader_election.cs
@@ -354,7 +354,7 @@ await _originalHost.WaitUntilAssignmentsChangeTo(w =>
 
         var runtime2 = host2.GetRuntime();
         await host2.InvokeMessageAndWaitAsync(new CheckAgentHealth());
-        await runtime2.Tracker.WaitUntilAssumesLeadershipAsync(5.Seconds());
+        await runtime2.Tracker.WaitUntilAssumesLeadershipAsync(15.Seconds());
 
 
         await host2.WaitUntilAssignmentsChangeTo(w =>

diff --git a/src/Persistence/PersistenceTests/PersistenceTests.csproj b/src/Persistence/PersistenceTests/PersistenceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
 
         <LangVersion>10</LangVersion>

diff --git a/src/Persistence/ScheduledJobTests/ScheduledJobTests.csproj b/src/Persistence/ScheduledJobTests/ScheduledJobTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/src/Samples/PingPong/Pinger/Pinger.csproj b/src/Samples/PingPong/Pinger/Pinger.csproj
@@ -5,11 +5,6 @@
         <UserSecretsId>dotnet-Pinger-819CA4EE-78C2-4B8C-93A5-0F271BCB1705</UserSecretsId>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1"/>
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\..\Wolverine\Wolverine.csproj"/>
         <ProjectReference Include="..\Messages\Messages.csproj"/>

diff --git a/src/Samples/PingPongWithRabbitMq/Ponger/Ponger.csproj b/src/Samples/PingPongWithRabbitMq/Ponger/Ponger.csproj
@@ -6,10 +6,6 @@
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\..\..\Transports\RabbitMQ\Wolverine.RabbitMQ\Wolverine.RabbitMQ.csproj" />
     </ItemGroup>

diff --git a/src/Testing/CoreTests/CoreTests.csproj b/src/Testing/CoreTests/CoreTests.csproj
@@ -2,13 +2,13 @@
 
     <PropertyGroup>
         <IsPackable>false</IsPackable>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.3.1" />
+        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
         <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" PrivateAssets="All" />

diff --git a/src/Transports/AWS/Wolverine.AmazonSqs.Tests/Wolverine.AmazonSqs.Tests.csproj b/src/Transports/AWS/Wolverine.AmazonSqs.Tests/Wolverine.AmazonSqs.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/src/Transports/Azure/Wolverine.AzureServiceBus.Tests/Wolverine.AzureServiceBus.Tests.csproj b/src/Transports/Azure/Wolverine.AzureServiceBus.Tests/Wolverine.AzureServiceBus.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>

diff --git a/src/Transports/Pulsar/Wolverine.Pulsar.Tests/Wolverine.Pulsar.Tests.csproj b/src/Transports/Pulsar/Wolverine.Pulsar.Tests/Wolverine.Pulsar.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
 
         <RootNamespace>Jasper.Pulsar.Tests</RootNamespace>

diff --git a/src/Transports/RabbitMQ/Wolverine.RabbitMQ.Tests/Wolverine.RabbitMQ.Tests.csproj b/src/Transports/RabbitMQ/Wolverine.RabbitMQ.Tests/Wolverine.RabbitMQ.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
         <IsPackable>false</IsPackable>
 

diff --git a/src/Wolverine/Wolverine.csproj b/src/Wolverine/Wolverine.csproj
@@ -7,27 +7,41 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="FastExpressionCompiler" Version="3.3.4" />
-        <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="12.0.1" />
+        <PackageReference Include="FastExpressionCompiler" Version="4.0.0" />
+        <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="12.1.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="[6.0.0,8.0.0)" />
-
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[6.0.0,8.0.0)" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[6.0.0,8.0.0)" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[6.0.0,8.0.0)" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[6.0.0,8.0.0)" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="[6.0.0,8.0.0)" />
-        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="[6.0.0,8.0.0)" />
-        <PackageReference Include="Oakton" Version="6.0.2" />
-
-        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="[6.0.0,8.0.0)" />
+        <PackageReference Include="Oakton" Version="6.1.0" />
         <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
         <PackageReference Include="System.ComponentModel" Version="4.3.0" />
-        <PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.2.0" />
-        <PackageReference Include="JasperFx.RuntimeCompiler" Version="3.2.0" />
-        <PackageReference Include="JasperFx.Core" Version="1.4.3" />
+        <PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.4.0" />
+        <PackageReference Include="JasperFx.RuntimeCompiler" Version="3.4.0" />
+        <PackageReference Include="JasperFx.Core" Version="1.5.1" />
     </ItemGroup>
 
     <Import Project="../../Analysis.Build.props" />
+
+    <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)" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[8.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[8.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[8.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="[8.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="[8.0.0,9.0.0)" />
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="[8.0.0,9.0.0)" />
+    </ItemGroup>
+
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="[6.0.0,9.0.0)" />
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="[6.0.0,9.0.0)" />
+    </ItemGroup>
+
 </Project>