Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding .NET 9 Support. Bumps to 3.3 #1134

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Adding .NET 9 Support. Bumps to 3.3 #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/publish_nugets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/Http/Wolverine.Http.Tests/multi_tenancy_detection_and_integration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
5 changes: 5 additions & 0 deletions src/Http/WolverineWebApi/WolverineWebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/Persistence/EfCoreTests/EfCoreTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 5 additions & 0 deletions src/Persistence/PersistenceTests/PersistenceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/Persistence/Wolverine.EntityFrameworkCore/Wolverine.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Persistence/Wolverine.Marten/Wolverine.Marten.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Persistence/Wolverine.Postgresql/Wolverine.Postgresql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Persistence/Wolverine.RDBMS/Wolverine.RDBMS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Persistence/Wolverine.SqlServer/Wolverine.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
22 changes: 17 additions & 5 deletions src/Wolverine/Wolverine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"/>
Expand Down
Loading