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

feat: add net9 #114

Merged
merged 2 commits into from
Dec 15, 2024
Merged

feat: add net9 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f66877
ci: add .NET 9 preview test pipeline
skwasjer Sep 10, 2024
ac7050a
feat: add .NET 9
skwasjer Sep 8, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_NOLOGO: true
dotnet-version: |
9.0.x
8.0.x
6.0.x
3.1.x
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_NOLOGO: true
dotnet-version: |
9.0.x
8.0.x
6.0.x
3.1.x
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/net-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
on:
push:
branches:
- main
release:
types:
- published
pull_request:

name: net-preview
env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_NOLOGO: true
dotnet-version: 9.0.100-preview.7.24407.12
dotnet-target: net9.0

jobs:
test:
runs-on: ubuntu-latest
steps:
# Setup
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.dotnet-version }}

- run: dotnet --info

# Checkout
- uses: actions/checkout@v4
with:
fetch-depth: 1

# Run all tests
- run: dotnet test -c Release -f ${{ env.dotnet-target }} -p:NetPreview=true
1 change: 1 addition & 0 deletions .github/workflows/sonarcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_NOLOGO: true
dotnet-version: |
9.0.x
8.0.x
6.0.x
3.1.x
Expand Down
8 changes: 4 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

<PropertyGroup>
<!-- Microsoft.Extensions.* -->
<PackageVersion_Microsoft_Extensions>9.0.0</PackageVersion_Microsoft_Extensions>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'!='net9.0' And '$(TargetFramework)'!='net6.0'">
<PackageVersion_Microsoft_Extensions>8.0.0</PackageVersion_Microsoft_Extensions>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageVersion_Microsoft_Extensions>6.0.0</PackageVersion_Microsoft_Extensions>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2')) Or '$(TargetFramework)'=='netcoreapp3.1'">
<PackageVersion_Microsoft_Extensions>3.1.26</PackageVersion_Microsoft_Extensions>
</PropertyGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Correlate.Abstractions/Correlate.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/Correlate.AspNetCore/Correlate.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>

Expand Down
5 changes: 3 additions & 2 deletions src/Correlate.Core/Correlate.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>

Expand All @@ -20,7 +21,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(PackageVersion_Microsoft_Extensions)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_Microsoft_Extensions)" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" Condition="'$(TargetFramework)'=='netstandard2.0'" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" Condition="'$(TargetFramework)'=='netstandard2.0'" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Correlate.DependencyInjection/Correlate.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
8 changes: 7 additions & 1 deletion test/Correlate.AspNetCore.Tests/Correlate.AspNetCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<Microsoft_AspNetCore_Mvc_Testing>9.0.0</Microsoft_AspNetCore_Mvc_Testing>
<Serilog_AspNetCore>9.0.0</Serilog_AspNetCore>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
<Microsoft_AspNetCore_Mvc_Testing>8.0.8</Microsoft_AspNetCore_Mvc_Testing>
<Serilog_AspNetCore>8.0.0</Serilog_AspNetCore>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion test/Correlate.Benchmarks/Correlate.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTestProject>false</IsTestProject>
Expand Down
3 changes: 2 additions & 1 deletion test/Correlate.Core.Tests/Correlate.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<RootNamespace>Correlate.DependencyInjection</RootNamespace>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion test/Correlate.Testing/Correlate.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition="'$(NetPreview)'=='true'">$(TargetFrameworks);netx.0</TargetFrameworks>
<IsTestProject>false</IsTestProject>
</PropertyGroup>

Expand Down
Loading