Skip to content

Commit fcda1b6

Browse files
bkoelmanbkoelman
committed
Multi-target against .NET 6 and .NET 8
1 parent c1b911f commit fcda1b6

File tree

60 files changed

+233
-123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+233
-123
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
- name: Setup .NET
4848
uses: actions/setup-dotnet@v3
4949
with:
50-
dotnet-version: 6.0.x
50+
dotnet-version: |
51+
6.0.x
52+
8.0.x
5153
- name: Setup PowerShell (Ubuntu)
5254
if: matrix.os == 'ubuntu-latest'
5355
run: |
@@ -182,7 +184,9 @@ jobs:
182184
- name: Setup .NET
183185
uses: actions/setup-dotnet@v3
184186
with:
185-
dotnet-version: 6.0.x
187+
dotnet-version: |
188+
6.0.x
189+
8.0.x
186190
- name: Git checkout
187191
uses: actions/checkout@v4
188192
- name: Restore tools
@@ -193,7 +197,7 @@ jobs:
193197
run: |
194198
$inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
195199
Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
196-
dotnet jb inspectcode JsonApiDotNetCore.sln --build --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
200+
dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
197201
- name: Verify outcome
198202
shell: pwsh
199203
run: |
@@ -233,7 +237,9 @@ jobs:
233237
- name: Setup .NET
234238
uses: actions/setup-dotnet@v3
235239
with:
236-
dotnet-version: 6.0.x
240+
dotnet-version: |
241+
6.0.x
242+
8.0.x
237243
- name: Git checkout
238244
uses: actions/checkout@v4
239245
with:
@@ -254,13 +260,13 @@ jobs:
254260
$baseCommitHash = git rev-parse HEAD~1
255261
256262
Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
257-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
263+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
258264
- name: CleanupCode (on branch)
259265
if: github.event_name == 'push' || github.event_name == 'release'
260266
shell: pwsh
261267
run: |
262268
Write-Output "Running code cleanup on all files."
263-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff
269+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version)--jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff
264270
265271
publish:
266272
timeout-minutes: 60

‎Directory.Build.props‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,15 @@
1313
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1414
</PropertyGroup>
1515

16-
<PropertyGroup>
17-
<!-- Published dependencies (only update on major version change) -->
18-
<TargetFrameworkName>net6.0</TargetFrameworkName>
19-
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
20-
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
21-
<EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
22-
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
23-
24-
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
25-
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
26-
<BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
27-
<BogusVersion>34.0.*</BogusVersion>
28-
<CSharpGuidelinesAnalyzerVersion>3.8.*</CSharpGuidelinesAnalyzerVersion>
29-
<CodeAnalysisVersion>4.7.*</CodeAnalysisVersion>
30-
<CoverletVersion>6.0.*</CoverletVersion>
31-
<DapperVersion>2.1.*</DapperVersion>
32-
<DateOnlyTimeOnlyVersion>2.1.*</DateOnlyTimeOnlyVersion>
33-
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
34-
<FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
35-
<GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
36-
<InheritDocVersion>1.3.*</InheritDocVersion>
37-
<JetBrainsAnnotationsVersion>2023.3.*</JetBrainsAnnotationsVersion>
38-
<NpgsqlVersion>7.0.*</NpgsqlVersion>
39-
<SourceLinkVersion>8.0.*</SourceLinkVersion>
40-
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
41-
<TestSdkVersion>17.8.*</TestSdkVersion>
42-
<XunitVersion>2.5.*</XunitVersion>
43-
</PropertyGroup>
44-
4516
<ItemGroup>
46-
<PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsAnnotationsVersion)" PrivateAssets="All" />
47-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="$(CSharpGuidelinesAnalyzerVersion)" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.*" PrivateAssets="All" />
18+
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />
4819
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
4920
</ItemGroup>
5021

5122
<PropertyGroup>
5223
<Nullable>enable</Nullable>
24+
<LangVersion>latest</LangVersion>
5325
<ImplicitUsings>enable</ImplicitUsings>
5426
<IsPackable>false</IsPackable>
5527
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>

‎JsonApiDotNetCore.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
CSharpGuidelinesAnalyzer.config = CSharpGuidelinesAnalyzer.config
1515
Directory.Build.props = Directory.Build.props
1616
tests.runsettings = tests.runsettings
17+
package-versions.props = package-versions.props
1718
EndProjectSection
1819
EndProject
1920
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{026FBC6C-AF76-4568-9B87-EC73457899FD}"

‎README.md‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,24 @@ app.MapControllers();
7676
The following chart should help you pick the best version, based on your environment.
7777
See also our [versioning policy](./VERSIONING_POLICY.md).
7878

79-
| JsonApiDotNetCore | Status | .NET | Entity Framework Core |
80-
| ----------------- | ----------- | -------- | --------------------- |
81-
| 3.x | Stable | Core 2.x | 2.x |
82-
| 4.x | Stable | Core 3.1 | 3.1 |
83-
| | | Core 3.1 | 5 |
84-
| | | 5 | 5 |
85-
| | | 6 | 5 |
86-
| 5.0.0-5.0.2 | Stable | 6 | 6 |
87-
| 5.0.3+ | Stable | 6 | 6 |
88-
| | | 6 | 7 |
89-
| | | 7 | 7 |
79+
| JsonApiDotNetCore | Status | .NET | Entity Framework Core |
80+
| ----------------- | ------------ | -------- | --------------------- |
81+
| 3.x | Stable | Core 2.x | 2.x |
82+
| 4.x | Stable | Core 3.1 | 3.1, 5 |
83+
| | | 5 | 5 |
84+
| | | 6 | 5 |
85+
| 5.0.0-5.0.2 | Stable | 6 | 6 |
86+
| 5.0.3-5.4.0 | Stable | 6 | 6, 7 |
87+
| | | 7 | 7 |
88+
| 5.5+ | Stable | 6 | 6, 7 |
89+
| | | 7 | 7 |
90+
| | | 8 | 8 |
91+
| master | Preview | 6 | 6, 7 |
92+
| | | 7 | 7 |
93+
| | | 8 | 8 |
94+
| openapi | Experimental | 6 | 6, 7 |
95+
| | | 7 | 7 |
96+
| | | 8 | 8 |
9097

9198
## Contributing
9299

‎benchmarks/Benchmarks.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ServerGarbageCollection>true</ServerGarbageCollection>
66
</PropertyGroup>
77

8+
<Import Project="..\package-versions.props" />
9+
810
<ItemGroup>
911
<ProjectReference Include="..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
1012
</ItemGroup>

‎cleanupcode.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ if ($revision) {
2828

2929
if ($baseCommitHash -eq $headCommitHash) {
3030
Write-Output "Running code cleanup on staged/unstaged files."
31-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified
31+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified
3232
VerifySuccessExitCode
3333
}
3434
else {
3535
Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
36-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
36+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
3737
VerifySuccessExitCode
3838
}
3939
}
4040
else {
4141
Write-Output "Running code cleanup on all files."
42-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN
42+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN
4343
VerifySuccessExitCode
4444
}

‎docs/generate-examples.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function Start-WebServer {
3434
Write-Output "Starting web server"
3535
$startTimeUtc = Get-Date -AsUTC
3636
$job = Start-Job -ScriptBlock {
37-
dotnet run --project ..\src\Examples\GettingStarted\GettingStarted.csproj --configuration Debug --property:TreatWarningsAsErrors=True --urls=http://0.0.0.0:14141
37+
dotnet run --project ..\src\Examples\GettingStarted\GettingStarted.csproj --framework net8.0 --configuration Debug --property:TreatWarningsAsErrors=True --urls=http://0.0.0.0:14141
3838
}
3939

4040
$webProcessId = $null

‎inspectcode.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if ($LastExitCode -ne 0) {
1010

1111
$outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
1212
$resultPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.html')
13-
dotnet jb inspectcode JsonApiDotNetCore.sln --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
13+
dotnet jb inspectcode JsonApiDotNetCore.sln --dotnetcoresdk=$(dotnet --version) --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
1414

1515
if ($LastExitCode -ne 0) {
1616
throw "Code inspection failed with exit code $LastExitCode"

‎package-versions.props‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Published dependencies (only update on major version change) -->
4+
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
5+
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
6+
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
7+
8+
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
9+
<BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
10+
<BogusVersion>34.0.*</BogusVersion>
11+
<CodeAnalysisVersion>4.7.*</CodeAnalysisVersion>
12+
<CoverletVersion>6.0.*</CoverletVersion>
13+
<DapperVersion>2.1.*</DapperVersion>
14+
<FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
15+
<GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
16+
<InheritDocVersion>1.3.*</InheritDocVersion>
17+
<SourceLinkVersion>8.0.*</SourceLinkVersion>
18+
<TestSdkVersion>17.8.*</TestSdkVersion>
19+
<XunitVersion>2.5.*</XunitVersion>
20+
</PropertyGroup>
21+
22+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
23+
<!-- Published dependencies (only update on major version change) -->
24+
<EntityFrameworkCoreFrozenVersion>8.0.0</EntityFrameworkCoreFrozenVersion>
25+
26+
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
27+
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
28+
<EntityFrameworkCoreVersion>8.0.*-*</EntityFrameworkCoreVersion>
29+
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
30+
</PropertyGroup>
31+
32+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
33+
<!-- Published dependencies (only update on major version change) -->
34+
<EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
35+
36+
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
37+
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
38+
<DateOnlyTimeOnlyVersion>2.1.*</DateOnlyTimeOnlyVersion>
39+
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
40+
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
41+
</PropertyGroup>
42+
</Project>

‎src/Examples/DapperExample/DapperExample.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
3+
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
44
</PropertyGroup>
55

6+
<Import Project="..\..\..\package-versions.props" />
7+
68
<ItemGroup>
79
<ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
810
<ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
@@ -13,7 +15,7 @@
1315
<PackageReference Include="Dapper" Version="$(DapperVersion)" />
1416
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
1517
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCoreVersion)" />
16-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
18+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
1719
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCoreVersion)" />
1820
</ItemGroup>
1921
</Project>

0 commit comments

Comments
 (0)