Skip to content

Commit 4e3053f

Browse files
davidkallesenperkops
davidkallesen
authored and
perkops
committed
feat: update to dotnet9
1 parent 31395c5 commit 4e3053f

File tree

42 files changed

+187
-168
lines changed

Some content is hidden

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

42 files changed

+187
-168
lines changed

‎.editorconfig

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# ATC coding rules - https://github.com/atc-net/atc-coding-rules
2-
# Version: 1.0.1
3-
# Updated: 03-06-2024
2+
# Version: 1.0.0
3+
# Updated: 01-03-2025
44
# Location: Root
5-
# Distribution: DotNet8
5+
# Distribution: DotNet9
66
# Inspired by: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options
77

88
##########################################
@@ -492,6 +492,8 @@ dotnet_diagnostic.CA1867.severity = suggestion # Use char overload
492492
dotnet_diagnostic.CA1868.severity = suggestion # Unnecessary call to 'Contains(item)'
493493
dotnet_diagnostic.CA1869.severity = suggestion # Cache and reuse 'JsonSerializerOptions' instances
494494
dotnet_diagnostic.CA1870.severity = suggestion # Use a cached 'SearchValues' instance
495+
dotnet_diagnostic.CA1871.severity = suggestion # Do not pass a nullable struct to 'ArgumentNullException.ThrowIfNull'
496+
dotnet_diagnostic.CA1872.severity = suggestion # Prefer 'Convert.ToHexString' and 'Convert.ToHexStringLower' over call chains based on 'BitConverter.ToString'
495497
dotnet_diagnostic.CA2007.severity = suggestion # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA2007.md
496498
dotnet_diagnostic.CA2017.severity = error # Parameter count mismatch
497499
dotnet_diagnostic.CA2018.severity = error # The count argument to Buffer.BlockCopy should specify the number of bytes to copy
@@ -505,6 +507,9 @@ dotnet_diagnostic.CA2255.severity = suggestion # The ModuleInitializer attr
505507
dotnet_diagnostic.CA2259.severity = error # Ensure ThreadStatic is only used with static fields
506508
dotnet_diagnostic.CA2260.severity = error # Implement generic math interfaces correctly
507509
dotnet_diagnostic.CA2261.severity = error # Do not use ConfigureAwaitOptions.SuppressThrowing with Task<TResult>
510+
dotnet_diagnostic.CA2262.severity = suggestion # Set 'MaxResponseHeadersLength' properly
511+
dotnet_diagnostic.CA2263.severity = suggestion # Prefer generic overload when type is known
512+
dotnet_diagnostic.CA2264.severity = error # Do not pass a non-nullable value to 'ArgumentNullException.ThrowIfNull'
508513
dotnet_diagnostic.IDE0005.severity = warning # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/IDE0005.md
509514
dotnet_diagnostic.IDE0010.severity = suggestion # Populate switch
510515
dotnet_diagnostic.IDE0028.severity = suggestion # Collection initialization can be simplified
@@ -556,6 +561,7 @@ dotnet_diagnostic.S3358.severity = none # Extract this nested ternary
556561
dotnet_diagnostic.S6602.severity = none # "Find" method should be used instead of the "FirstOrDefault"
557562
dotnet_diagnostic.S6603.severity = none # The collection-specific "TrueForAll" method should be used instead of the "All"
558563
dotnet_diagnostic.S6605.severity = none # Collection-specific "Exists" method should be used instead of the "Any"
564+
dotnet_diagnostic.S6964.severity = none # Value type property used as input in a controller action should be nullable, required or annotated with the JsonRequiredAttribute to avoid under-posting.
559565

560566

561567
##########################################

‎.github/workflows/post-integration.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- '!stable'
8-
- '!release'
7+
- "!stable"
8+
- "!release"
99

1010
env:
11-
ATC_EMAIL: '[email protected]'
12-
ATC_NAME: 'Atc-Net'
13-
NUGET_REPO_URL: 'https://nuget.pkg.github.com/atc-net/index.json'
11+
ATC_EMAIL: "[email protected]"
12+
ATC_NAME: "Atc-Net"
13+
NUGET_REPO_URL: "https://nuget.pkg.github.com/atc-net/index.json"
1414

1515
jobs:
1616
merge-to-stable:
@@ -30,16 +30,16 @@ jobs:
3030
with:
3131
setAllVars: true
3232

33-
- name: ⚙️ Setup dotnet 8.0.x
33+
- name: ⚙️ Setup dotnet 9.0.x
3434
uses: actions/setup-dotnet@v4
3535
with:
36-
dotnet-version: '8.0.x'
36+
dotnet-version: "9.0.x"
3737

3838
- name: ⚙️ Set up JDK 17
3939
uses: actions/setup-java@v3
4040
with:
4141
java-version: 17
42-
distribution: 'zulu'
42+
distribution: "zulu"
4343

4444
- name: 🧹 Clean
4545
run: dotnet clean -c Release && dotnet nuget locals all --clear

‎.github/workflows/pre-integration.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
fetch-depth: 0
2222

23-
- name: ⚙️ Setup dotnet 8.0.x
23+
- name: ⚙️ Setup dotnet 9.0.x
2424
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: '8.0.x'
26+
dotnet-version: "9.0.x"
2727

2828
- name: 📐 Ensure nuget.org added as package source on Windows
2929
if: matrix.os == 'windows-latest'
@@ -46,10 +46,10 @@ jobs:
4646
with:
4747
fetch-depth: 0
4848

49-
- name: ⚙️ Setup dotnet 8.0.x
49+
- name: ⚙️ Setup dotnet 9.0.x
5050
uses: actions/setup-dotnet@v4
5151
with:
52-
dotnet-version: '8.0.x'
52+
dotnet-version: "9.0.x"
5353

5454
- name: 🔁 Restore packages
5555
run: dotnet restore
@@ -74,10 +74,10 @@ jobs:
7474
with:
7575
fetch-depth: 0
7676

77-
- name: ⚙️ Setup dotnet 8.0.x
77+
- name: ⚙️ Setup dotnet 9.0.x
7878
uses: actions/setup-dotnet@v4
7979
with:
80-
dotnet-version: '8.0.x'
80+
dotnet-version: "9.0.x"
8181

8282
- name: 📐 Ensure nuget.org added as package source on Windows
8383
if: matrix.os == 'windows-latest'
@@ -99,4 +99,4 @@ jobs:
9999

100100
- name: 🛠️ Build Generated Code
101101
run: dotnet build
102-
working-directory: petstore3
102+
working-directory: petstore3

‎.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55

66
env:
7-
ATC_EMAIL: '[email protected]'
8-
ATC_NAME: 'Atc-Net'
9-
NUGET_REPO_URL: 'https://api.nuget.org/v3/index.json'
7+
ATC_EMAIL: "[email protected]"
8+
ATC_NAME: "Atc-Net"
9+
NUGET_REPO_URL: "https://api.nuget.org/v3/index.json"
1010

1111
jobs:
1212
release:
@@ -27,10 +27,10 @@ jobs:
2727
with:
2828
setAllVars: true
2929

30-
- name: ⚙️ Setup dotnet 8.0.x
30+
- name: ⚙️ Setup dotnet 9.0.x
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: '8.0.x'
33+
dotnet-version: "9.0.x"
3434

3535
- name: 🧹 Clean
3636
run: dotnet clean -c Release && dotnet nuget locals all --clear
@@ -61,4 +61,4 @@ jobs:
6161
uses: satak/webrequest-action@master
6262
with:
6363
url: https://atc-api.azurewebsites.net/nuget-search/package?packageId=atc-rest-api-generator&invalidateCache=true
64-
method: GET
64+
method: GET

‎Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Nullable>enable</Nullable>
1919
<LangVersion>12.0</LangVersion>
2020
<ImplicitUsings>enable</ImplicitUsings>
21-
<TargetFramework>net8.0</TargetFramework>
21+
<TargetFramework>net9.0</TargetFramework>
2222
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2323
<NoWarn>1573,1591,1712</NoWarn>
2424

@@ -43,10 +43,10 @@
4343
<ItemGroup Label="Code Analyzers">
4444
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
4545
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
46-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.179" PrivateAssets="All" />
46+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.188" PrivateAssets="All" />
4747
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
4848
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
49-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" PrivateAssets="All" />
49+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445" PrivateAssets="All" />
5050
</ItemGroup>
5151

5252
</Project>

‎README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@
4242

4343
|Project|Target Framework|Description|Nuget Download Link|
4444
|---|---|---|---|
45-
|[Atc.Rest.ApiGenerator](src/Atc.Rest.ApiGenerator) | net8.0 | Atc.Rest.ApiGenerator is a WebApi C# code generator using a OpenApi 3.0.x specification YAML file. | [![Nuget](https://img.shields.io/nuget/dt/Atc.Rest.ApiGenerator?logo=nuget&style=flat-square)](https://www.nuget.org/packages/Atc.Rest.ApiGenerator) |
46-
|[Atc.Rest.ApiGenerator.CLI](src/Atc.Rest.ApiGenerator.CLI) |net8.0 | A CLI tool that use Atc.Rest.ApiGenerator to create/update a project specified by a OpenApi 3.0.x specification YAML file. | [![Nuget](https://img.shields.io/nuget/dt/atc-rest-api-generator?logo=nuget&style=flat-square)](https://www.nuget.org/packages/atc-rest-api-generator) |
47-
|[Atc.Rest.ApiGenerator.CodingRules](src/Atc.Rest.ApiGenerator.CodingRules) | net8.0| Create/update atc coding rules for the generated code | |
48-
|[Atc.Rest.ApiGenerator.Contracts](src/Atc.Rest.ApiGenerator.Contracts) | net8.0| Shared contracts and interfaces for the generated code. | |
49-
|[Atc.Rest.ApiGenerator.Framework.Mvc](src/Atc.Rest.ApiGenerator.Framework.Mvc) | net8.0| Provides support for generating ASP.NET MVC / Controller based REST API server implementations. | |
50-
|[Atc.Rest.ApiGenerator.Framework.Minimal](src/Atc.Rest.ApiGenerator.Framework.Minimal) | net8.0| Provides support for generating MinimalAPI based REST server implementations. | |
51-
|[Atc.Rest.ApiGenerator.Client.CSharp](src/Atc.Rest.ApiGenerator.Client.CSharp) | net8.0| Generates C# client code for interacting with the generated REST APIs. | |
52-
|[Atc.Rest.ApiGenerator.Framework](src/Atc.Rest.ApiGenerator.Framework) | net8.0| Shared framework components and utilities for the API generator projects. | |
53-
|[Atc.Rest.ApiGenerator.OpenApi](src/Atc.Rest.ApiGenerator.OpenApi) | net8.0| Handles OpenAPI specification parsing and manipulation for the API generator. | |
54-
|[Atc.Rest.ApiGenerator.Nuget](src/Atc.Rest.ApiGenerator.Nuget) | net8.0| Manages NuGet packages required by the generated code and frameworks. | |
55-
|[Atc.CodeGeneration.CSharp](src/Atc.CodeGeneration.CSharp) | net8.0| Provides utilities and functionalities for generating C# code. | |
45+
|[Atc.Rest.ApiGenerator](src/Atc.Rest.ApiGenerator) | net9.0 | Atc.Rest.ApiGenerator is a WebApi C# code generator using a OpenApi 3.0.x specification YAML file. | [![Nuget](https://img.shields.io/nuget/dt/Atc.Rest.ApiGenerator?logo=nuget&style=flat-square)](https://www.nuget.org/packages/Atc.Rest.ApiGenerator) |
46+
|[Atc.Rest.ApiGenerator.CLI](src/Atc.Rest.ApiGenerator.CLI) |net9.0 | A CLI tool that use Atc.Rest.ApiGenerator to create/update a project specified by a OpenApi 3.0.x specification YAML file. | [![Nuget](https://img.shields.io/nuget/dt/atc-rest-api-generator?logo=nuget&style=flat-square)](https://www.nuget.org/packages/atc-rest-api-generator) |
47+
|[Atc.Rest.ApiGenerator.CodingRules](src/Atc.Rest.ApiGenerator.CodingRules) | net9.0| Create/update atc coding rules for the generated code | |
48+
|[Atc.Rest.ApiGenerator.Contracts](src/Atc.Rest.ApiGenerator.Contracts) | net9.0| Shared contracts and interfaces for the generated code. | |
49+
|[Atc.Rest.ApiGenerator.Framework.Mvc](src/Atc.Rest.ApiGenerator.Framework.Mvc) | net9.0| Provides support for generating ASP.NET MVC / Controller based REST API server implementations. | |
50+
|[Atc.Rest.ApiGenerator.Framework.Minimal](src/Atc.Rest.ApiGenerator.Framework.Minimal) | net9.0| Provides support for generating MinimalAPI based REST server implementations. | |
51+
|[Atc.Rest.ApiGenerator.Client.CSharp](src/Atc.Rest.ApiGenerator.Client.CSharp) | net9.0| Generates C# client code for interacting with the generated REST APIs. | |
52+
|[Atc.Rest.ApiGenerator.Framework](src/Atc.Rest.ApiGenerator.Framework) | net9.0| Shared framework components and utilities for the API generator projects. | |
53+
|[Atc.Rest.ApiGenerator.OpenApi](src/Atc.Rest.ApiGenerator.OpenApi) | net9.0| Handles OpenAPI specification parsing and manipulation for the API generator. | |
54+
|[Atc.Rest.ApiGenerator.Nuget](src/Atc.Rest.ApiGenerator.Nuget) | net9.0| Manages NuGet packages required by the generated code and frameworks. | |
55+
|[Atc.CodeGeneration.CSharp](src/Atc.CodeGeneration.CSharp) | net9.0| Provides utilities and functionalities for generating C# code. | |
5656

5757
## Project dependency graph
5858

@@ -512,23 +512,23 @@ Running the above command produces the following output:
512512
🟢 root: atc-coding-rules-updater.json created
513513
🟢 root: atc-coding-rules-updater.ps1 created
514514
🐭 Working on EditorConfig files
515-
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet8/.editorconfig
515+
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet9/.editorconfig
516516
Download time: 27.947 ms
517517
🟢 root: .editorconfig created
518-
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet8/src/.editorconfig
518+
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet9/src/.editorconfig
519519
Download time: 22.987 ms
520520
🟢 src: .editorconfig created
521-
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet8/test/.editorconfig
521+
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet9/test/.editorconfig
522522
Download time: 24.465 ms
523523
🟢 test: .editorconfig created
524524
🔨 Working on Directory.Build.props files
525-
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet8/Directory.Build.props
525+
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet9/Directory.Build.props
526526
Download time: 20.880 ms
527527
🟢 root: Directory.Build.props created
528-
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet8/src/Directory.Build.props
528+
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet9/src/Directory.Build.props
529529
Download time: 48.340 ms
530530
🟢 src: Directory.Build.props created
531-
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet8/test/Directory.Build.props
531+
Download from: [GitHub] /atc-net/atc-coding-rules/main/distribution/dotnet9/test/Directory.Build.props
532532
Download time: 29.480 ms
533533
🟢 test: Directory.Build.props created
534534
✅ Done

‎atc-coding-rules-updater.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"projectTarget": "DotNet8",
2+
"projectTarget": "Dotnet9",
33
"useLatestMinorNugetVersion": true,
44
"useTemporarySuppressions": false,
55
"temporarySuppressionAsExcel": false,

‎src/.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# ATC coding rules - https://github.com/atc-net/atc-coding-rules
22
# Version: 1.0.0
3-
# Updated: 25-09-2023
3+
# Updated: 03-06-2024
44
# Location: src
5-
# Distribution: DotNet8
5+
# Distribution: DotNet9
66
# Inspired by: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options
77

88
##########################################

‎src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Atc" Version="2.0.525" />
10-
<PackageReference Include="Atc.CodeDocumentation" Version="2.0.525" />
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
9+
<PackageReference Include="Atc" Version="2.0.552" />
10+
<PackageReference Include="Atc.CodeDocumentation" Version="2.0.552" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Update="SonarAnalyzer.CSharp" Version="10.7.0.110445" />
1216
</ItemGroup>
1317

1418
</Project>

‎src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<PackageId>atc-rest-api-generator</PackageId>
66
<PackageTags>rest;api;netstandard;generator</PackageTags>
77
<Description>A .NET Core Web API C# code generator using a OpenApi 3.0.x specification YAML file.</Description>
@@ -13,9 +13,9 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Atc" Version="2.0.525" />
17-
<PackageReference Include="Atc.Console.Spectre" Version="2.0.525" />
18-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
16+
<PackageReference Include="Atc" Version="2.0.552" />
17+
<PackageReference Include="Atc.Console.Spectre" Version="2.0.552" />
18+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

0 commit comments

Comments
 (0)