From b8565b08e10fc39eeab5e1a1f71a97ce1eddbe5c Mon Sep 17 00:00:00 2001 From: Pavel Novikau Date: Fri, 27 Dec 2024 16:09:16 +0100 Subject: [PATCH 1/2] Upgrade projects to support .NET 9.0 - Removed `net7.0` from all projects - Added `net9.0` to all projects --- .azuredevops/azure-pipelines.yml | 2 +- .gitignore | 3 +++ .../GodelTech.Microservices.Swagger.Demo.csproj | 10 +++++----- .../GodelTech.Microservices.Swagger.csproj | 2 +- ...lTech.Microservices.Swagger.IntegrationTests.csproj | 10 +++++----- .../GodelTech.Microservices.Swagger.Tests.csproj | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.azuredevops/azure-pipelines.yml b/.azuredevops/azure-pipelines.yml index 2834c35..0648071 100644 --- a/.azuredevops/azure-pipelines.yml +++ b/.azuredevops/azure-pipelines.yml @@ -20,7 +20,7 @@ resources: extends: template: '.azuredevops/.NET/NuGet.yml@GodelTech' parameters: - dotNetSDKVersions: [ '6.0.x', '7.0.x', '8.0.x' ] + dotNetSDKVersions: [ '6.0.x', '8.0.x', '9.0.x' ] mutationTestingProjects: - displayName: 'GodelTech.Microservices.Swagger' folderPath: '/src/GodelTech.Microservices.Swagger' diff --git a/.gitignore b/.gitignore index dfcfd56..b67693e 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,6 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +# Rider +.idea/ \ No newline at end of file diff --git a/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj b/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj index 7f00074..ed91253 100644 --- a/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj +++ b/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 1.2.3.4567 @@ -21,14 +21,14 @@ - - - - + + + + diff --git a/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj b/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj index f406077..8ec2b24 100644 --- a/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj +++ b/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 GodelTech.Microservices.Swagger 2.0.0 Andrei Salanoi;Vladimir Rodchenko;Andrei Yaskevich diff --git a/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj b/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj index a04aa3b..91d46d2 100644 --- a/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj +++ b/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 false @@ -15,14 +15,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj b/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj index e088dc4..f1ea5e8 100644 --- a/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj +++ b/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 false From e2b6cb1f26f8af9101b79967db1225c49a06a5bb Mon Sep 17 00:00:00 2001 From: Pavel Novikau Date: Fri, 27 Dec 2024 16:39:28 +0100 Subject: [PATCH 2/2] Update .editorconfig files to disable specific code analysis rules - Disabled CA1515 in `test/GodelTech.Microservices.Swagger.Tests/.editorconfig` - Disabled CA1515 in `test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig` - Disabled IDE0028 in `src/GodelTech.Microservices.Swagger/.editorconfig` --- src/GodelTech.Microservices.Swagger/.editorconfig | 3 +++ .../.editorconfig | 3 +++ test/GodelTech.Microservices.Swagger.Tests/.editorconfig | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/GodelTech.Microservices.Swagger/.editorconfig b/src/GodelTech.Microservices.Swagger/.editorconfig index 0b76c42..9599abe 100644 --- a/src/GodelTech.Microservices.Swagger/.editorconfig +++ b/src/GodelTech.Microservices.Swagger/.editorconfig @@ -5,3 +5,6 @@ csharp_style_namespace_declarations = block_scoped # IDE0074: Use compound assignment dotnet_diagnostic.IDE0074.severity = none + +# IDE0028: Simplify collection initialization +dotnet_diagnostic.IDE0028.severity = none \ No newline at end of file diff --git a/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig b/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig index ebf6a68..c26ce1e 100644 --- a/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig +++ b/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig @@ -8,3 +8,6 @@ dotnet_diagnostic.CA1014.severity = none # CA1707: Identifiers should not contain underscores dotnet_diagnostic.CA1707.severity = none + +# CA1515: Consider making public types internal +dotnet_diagnostic.CA1515.severity = none \ No newline at end of file diff --git a/test/GodelTech.Microservices.Swagger.Tests/.editorconfig b/test/GodelTech.Microservices.Swagger.Tests/.editorconfig index 4c35c57..ef20aa0 100644 --- a/test/GodelTech.Microservices.Swagger.Tests/.editorconfig +++ b/test/GodelTech.Microservices.Swagger.Tests/.editorconfig @@ -8,3 +8,6 @@ dotnet_diagnostic.CA1707.severity = none # CA1861: Avoid constant arrays as arguments dotnet_diagnostic.CA1861.severity = none + +# CA1515: Consider making public types internal +dotnet_diagnostic.CA1515.severity = none \ No newline at end of file