From a1f9e9a44a722ee9ac9b5b44df02de72bcdab27c Mon Sep 17 00:00:00 2001 From: Xavier Solau Date: Thu, 21 Nov 2024 00:01:29 +0100 Subject: [PATCH] Update to Net 9.0 & bump to version 2.3.0-beta.1 --- .github/workflows/build-ci.yml | 2 +- .github/workflows/build-pr.yml | 2 +- README.md | 54 +++++++++---------- src/SharedProperties.props | 2 +- .../SoloX.CodeQuality.Prod.Example.csproj | 4 +- .../SoloX.CodeQuality.Test.Example.csproj | 4 +- .../SoloX.CodeQuality.Playwright.csproj | 19 ++++--- .../build/SoloX.CodeQuality.Prod.props | 2 +- ...oloX.CodeQuality.Test.Helpers.NUnit.csproj | 19 +++++-- ...oloX.CodeQuality.Test.Helpers.XUnit.csproj | 6 +-- .../SoloX.CodeQuality.Test.Helpers.csproj | 2 +- .../build/SoloX.CodeQuality.Test.props | 2 +- .../style.cs.compiler.ca.editorconfig | 3 ++ src/libs/SoloX.CodeQuality.WebHost/Program.cs | 2 +- .../SoloX.CodeQuality.WebHost.csproj | 10 +++- .../build/SoloX.CodeQuality.WebHost.targets | 2 +- .../PackageNugetTestProject.csproj | 2 +- ...oloX.CodeQuality.Playwright.E2ETest.csproj | 16 ++++-- ...odeQuality.Test.Helpers.NUnit.UTest.csproj | 12 ++--- ...oloX.CodeQuality.Test.Helpers.UTest.csproj | 12 ++--- ...odeQuality.Test.Helpers.XUnit.UTest.csproj | 12 ++--- 21 files changed, 110 insertions(+), 79 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index b0ef4b4..684d732 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 8.0.402 + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index b702523..5902e43 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 8.0.402 + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore - name: Build diff --git a/README.md b/README.md index 01ba8ab..eb5b5b9 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,15 @@ It also provides: [![Build - CI](https://github.com/xaviersolau/CodeQuality/actions/workflows/build-ci.yml/badge.svg)](https://github.com/xaviersolau/CodeQuality/actions/workflows/build-ci.yml) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) -| Package | Nuget.org | -|-----------------------------------------|-----------| -|**SoloX.CodeQuality.Prod** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Prod.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Prod) -|**SoloX.CodeQuality.Test** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test) -|**SoloX.CodeQuality.Playwright** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Playwright.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Playwright) -|**SoloX.CodeQuality.Test.Helpers** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.Helpers.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers) -|**SoloX.CodeQuality.Test.Helpers.XUnit** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.Helpers.XUnit.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers.XUnit) -|**SoloX.CodeQuality.Test.Helpers.NUnit** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.Helpers.NUnit.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers.NUnit) -|**SoloX.CodeQuality.WebHost** |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.WebHost.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.WebHost) +| Package | Nuget.org | Pre-release | +|-----------------------------------------|-----------|-------------| +|**SoloX.CodeQuality.Prod** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.Prod.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Prod) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Prod.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Prod) +|**SoloX.CodeQuality.Test** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.Test.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test) +|**SoloX.CodeQuality.Playwright** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.Playwright.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Playwright) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Playwright.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Playwright) +|**SoloX.CodeQuality.Test.Helpers** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.Test.Helpers.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.Helpers.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers) +|**SoloX.CodeQuality.Test.Helpers.XUnit** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.Test.Helpers.XUnit.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers.XUnit) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.Helpers.XUnit.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers.XUnit) +|**SoloX.CodeQuality.Test.Helpers.NUnit** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.Test.Helpers.NUnit.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers.NUnit) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.Test.Helpers.NUnit.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.Test.Helpers.NUnit) +|**SoloX.CodeQuality.WebHost** |[![NuGet Beta](https://img.shields.io/nuget/v/SoloX.CodeQuality.WebHost.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.WebHost) |[![NuGet Beta](https://img.shields.io/nuget/vpre/SoloX.CodeQuality.WebHost.svg)](https://www.nuget.org/packages/SoloX.CodeQuality.WebHost) ## License and credits @@ -52,26 +52,26 @@ You can checkout this Github repository or you can use the NuGet package: **Install using the command line from the Package Manager:** ```bash -Install-Package SoloX.CodeQuality.Prod -version 2.2.2 +Install-Package SoloX.CodeQuality.Prod -version 2.3.0-beta.1 or -Install-Package SoloX.CodeQuality.Test -version 2.2.2 +Install-Package SoloX.CodeQuality.Test -version 2.3.0-beta.1 ``` **Install using the .Net CLI:** ```bash -dotnet add package SoloX.CodeQuality.Prod --version 2.2.2 +dotnet add package SoloX.CodeQuality.Prod --version 2.3.0-beta.1 or -dotnet add package SoloX.CodeQuality.Test --version 2.2.2 +dotnet add package SoloX.CodeQuality.Test --version 2.3.0-beta.1 ``` **Install editing your project file (csproj):** ```xml - + all runtime; build; native; contentfiles; analyzers or - + all runtime; build; native; contentfiles; analyzers @@ -218,17 +218,17 @@ You can checkout this Github repository or use the NuGet package: **Install using the command line from the Package Manager:** ```bash -Install-Package SoloX.CodeQuality.Playwright -version 2.2.2 +Install-Package SoloX.CodeQuality.Playwright -version 2.3.0-beta.1 ``` **Install using the .Net CLI:** ```bash -dotnet add package SoloX.CodeQuality.Playwright --version 2.2.2 +dotnet add package SoloX.CodeQuality.Playwright --version 2.3.0-beta.1 ``` **Install editing your project file (csproj):** ```xml - + ``` * * * @@ -420,29 +420,29 @@ You can checkout this Github repository or you can use the NuGet package: **Install using the command line from the Package Manager:** ```bash -Install-Package SoloX.CodeQuality.Test.Helpers -version 2.2.2 +Install-Package SoloX.CodeQuality.Test.Helpers -version 2.3.0-beta.1 -Install-Package SoloX.CodeQuality.Test.Helpers.XUnit -version 2.2.2 +Install-Package SoloX.CodeQuality.Test.Helpers.XUnit -version 2.3.0-beta.1 -Install-Package SoloX.CodeQuality.Test.Helpers.NUnit -version 2.2.2 +Install-Package SoloX.CodeQuality.Test.Helpers.NUnit -version 2.3.0-beta.1 ``` **Install using the .Net CLI:** ```bash -dotnet add package SoloX.CodeQuality.Test.Helpers --version 2.2.2 +dotnet add package SoloX.CodeQuality.Test.Helpers --version 2.3.0-beta.1 -dotnet add package SoloX.CodeQuality.Test.Helpers.XUnit --version 2.2.2 +dotnet add package SoloX.CodeQuality.Test.Helpers.XUnit --version 2.3.0-beta.1 -dotnet add package SoloX.CodeQuality.Test.Helpers.NUnit --version 2.2.2 +dotnet add package SoloX.CodeQuality.Test.Helpers.NUnit --version 2.3.0-beta.1 ``` **Install editing your project file (csproj):** ```xml - + - + - + ``` * * * diff --git a/src/SharedProperties.props b/src/SharedProperties.props index 230be3a..c293d82 100644 --- a/src/SharedProperties.props +++ b/src/SharedProperties.props @@ -1,7 +1,7 @@ - 2.2.2 + 2.3.0-beta.1 Xavier Solau Copyright © 2021 Xavier Solau MIT diff --git a/src/examples/SoloX.CodeQuality.Prod.Example/SoloX.CodeQuality.Prod.Example.csproj b/src/examples/SoloX.CodeQuality.Prod.Example/SoloX.CodeQuality.Prod.Example.csproj index c9b0ad8..fb02c7b 100644 --- a/src/examples/SoloX.CodeQuality.Prod.Example/SoloX.CodeQuality.Prod.Example.csproj +++ b/src/examples/SoloX.CodeQuality.Prod.Example/SoloX.CodeQuality.Prod.Example.csproj @@ -7,7 +7,7 @@ - net8.0 + net9.0 true @@ -21,7 +21,7 @@ - + diff --git a/src/examples/SoloX.CodeQuality.Test.Example/SoloX.CodeQuality.Test.Example.csproj b/src/examples/SoloX.CodeQuality.Test.Example/SoloX.CodeQuality.Test.Example.csproj index 591423e..9f11979 100644 --- a/src/examples/SoloX.CodeQuality.Test.Example/SoloX.CodeQuality.Test.Example.csproj +++ b/src/examples/SoloX.CodeQuality.Test.Example/SoloX.CodeQuality.Test.Example.csproj @@ -7,7 +7,7 @@ - net8.0 + net9.0 true @@ -17,7 +17,7 @@ - + diff --git a/src/libs/SoloX.CodeQuality.Playwright/SoloX.CodeQuality.Playwright.csproj b/src/libs/SoloX.CodeQuality.Playwright/SoloX.CodeQuality.Playwright.csproj index d072088..4ac495b 100644 --- a/src/libs/SoloX.CodeQuality.Playwright/SoloX.CodeQuality.Playwright.csproj +++ b/src/libs/SoloX.CodeQuality.Playwright/SoloX.CodeQuality.Playwright.csproj @@ -2,12 +2,12 @@ - + - + - net8.0 + net8.0;net9.0 enable enable @@ -18,9 +18,16 @@ - - - + + + + + + + + + + diff --git a/src/libs/SoloX.CodeQuality.Prod/build/SoloX.CodeQuality.Prod.props b/src/libs/SoloX.CodeQuality.Prod/build/SoloX.CodeQuality.Prod.props index 381ba44..9c1b8e9 100644 --- a/src/libs/SoloX.CodeQuality.Prod/build/SoloX.CodeQuality.Prod.props +++ b/src/libs/SoloX.CodeQuality.Prod/build/SoloX.CodeQuality.Prod.props @@ -4,7 +4,7 @@ $(OutputPath)$(MSBuildProjectName).xml true - 8.0 + 9.0 AllEnabledByDefault diff --git a/src/libs/SoloX.CodeQuality.Test.Helpers.NUnit/SoloX.CodeQuality.Test.Helpers.NUnit.csproj b/src/libs/SoloX.CodeQuality.Test.Helpers.NUnit/SoloX.CodeQuality.Test.Helpers.NUnit.csproj index fcfdc33..7f72702 100644 --- a/src/libs/SoloX.CodeQuality.Test.Helpers.NUnit/SoloX.CodeQuality.Test.Helpers.NUnit.csproj +++ b/src/libs/SoloX.CodeQuality.Test.Helpers.NUnit/SoloX.CodeQuality.Test.Helpers.NUnit.csproj @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - netstandard2.0 + net8.0;net9.0 SoloX.CodeQuality.Test.Helpers.NUnit @@ -27,9 +27,18 @@ - - - + + + + + + + + + + + + diff --git a/src/libs/SoloX.CodeQuality.Test.Helpers.XUnit/SoloX.CodeQuality.Test.Helpers.XUnit.csproj b/src/libs/SoloX.CodeQuality.Test.Helpers.XUnit/SoloX.CodeQuality.Test.Helpers.XUnit.csproj index 714f079..9c46c81 100644 --- a/src/libs/SoloX.CodeQuality.Test.Helpers.XUnit/SoloX.CodeQuality.Test.Helpers.XUnit.csproj +++ b/src/libs/SoloX.CodeQuality.Test.Helpers.XUnit/SoloX.CodeQuality.Test.Helpers.XUnit.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/src/libs/SoloX.CodeQuality.Test.Helpers/SoloX.CodeQuality.Test.Helpers.csproj b/src/libs/SoloX.CodeQuality.Test.Helpers/SoloX.CodeQuality.Test.Helpers.csproj index 2c9c4eb..ee44ca9 100644 --- a/src/libs/SoloX.CodeQuality.Test.Helpers/SoloX.CodeQuality.Test.Helpers.csproj +++ b/src/libs/SoloX.CodeQuality.Test.Helpers/SoloX.CodeQuality.Test.Helpers.csproj @@ -31,7 +31,7 @@ - + \ No newline at end of file diff --git a/src/libs/SoloX.CodeQuality.Test/build/SoloX.CodeQuality.Test.props b/src/libs/SoloX.CodeQuality.Test/build/SoloX.CodeQuality.Test.props index 76e6b0e..42cb4e7 100644 --- a/src/libs/SoloX.CodeQuality.Test/build/SoloX.CodeQuality.Test.props +++ b/src/libs/SoloX.CodeQuality.Test/build/SoloX.CodeQuality.Test.props @@ -4,7 +4,7 @@ $(OutputPath)$(MSBuildProjectName).xml true - 8.0 + 9.0 AllEnabledByDefault diff --git a/src/libs/SoloX.CodeQuality.Test/resources/style.cs.compiler.ca.editorconfig b/src/libs/SoloX.CodeQuality.Test/resources/style.cs.compiler.ca.editorconfig index ebcb40a..604afd2 100644 --- a/src/libs/SoloX.CodeQuality.Test/resources/style.cs.compiler.ca.editorconfig +++ b/src/libs/SoloX.CodeQuality.Test/resources/style.cs.compiler.ca.editorconfig @@ -13,6 +13,9 @@ dotnet_diagnostic.CA1032.severity = error # CA1506: class coupling dotnet_diagnostic.CA1506.severity = none +# CA1515: Consider making public types internal +dotnet_diagnostic.CA1515.severity = none + # CA1507: Utiliser nameof pour exprimer les noms de symboles dotnet_diagnostic.CA1507.severity = error diff --git a/src/libs/SoloX.CodeQuality.WebHost/Program.cs b/src/libs/SoloX.CodeQuality.WebHost/Program.cs index 6f5936a..e57c8bf 100644 --- a/src/libs/SoloX.CodeQuality.WebHost/Program.cs +++ b/src/libs/SoloX.CodeQuality.WebHost/Program.cs @@ -10,7 +10,7 @@ namespace SoloX.CodeQuality.WebHost { - public sealed class Program + internal sealed class Program { public static void Main(string[] args) { diff --git a/src/libs/SoloX.CodeQuality.WebHost/SoloX.CodeQuality.WebHost.csproj b/src/libs/SoloX.CodeQuality.WebHost/SoloX.CodeQuality.WebHost.csproj index d828a14..f72ae33 100644 --- a/src/libs/SoloX.CodeQuality.WebHost/SoloX.CodeQuality.WebHost.csproj +++ b/src/libs/SoloX.CodeQuality.WebHost/SoloX.CodeQuality.WebHost.csproj @@ -7,17 +7,23 @@ - net8.0 + net8.0;net9.0 enable enable true true + - + + + + + + diff --git a/src/libs/SoloX.CodeQuality.WebHost/build/SoloX.CodeQuality.WebHost.targets b/src/libs/SoloX.CodeQuality.WebHost/build/SoloX.CodeQuality.WebHost.targets index e41aa2d..701650a 100644 --- a/src/libs/SoloX.CodeQuality.WebHost/build/SoloX.CodeQuality.WebHost.targets +++ b/src/libs/SoloX.CodeQuality.WebHost/build/SoloX.CodeQuality.WebHost.targets @@ -2,7 +2,7 @@ - + diff --git a/src/tests/SoloX.CodeQuality.Playwright.E2ETest/Resources/PackageNugetTestProject/PackageNugetTestProject/PackageNugetTestProject.csproj b/src/tests/SoloX.CodeQuality.Playwright.E2ETest/Resources/PackageNugetTestProject/PackageNugetTestProject/PackageNugetTestProject.csproj index 0cb8845..4368c00 100644 --- a/src/tests/SoloX.CodeQuality.Playwright.E2ETest/Resources/PackageNugetTestProject/PackageNugetTestProject/PackageNugetTestProject.csproj +++ b/src/tests/SoloX.CodeQuality.Playwright.E2ETest/Resources/PackageNugetTestProject/PackageNugetTestProject/PackageNugetTestProject.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/tests/SoloX.CodeQuality.Playwright.E2ETest/SoloX.CodeQuality.Playwright.E2ETest.csproj b/src/tests/SoloX.CodeQuality.Playwright.E2ETest/SoloX.CodeQuality.Playwright.E2ETest.csproj index 24dddc1..e642841 100644 --- a/src/tests/SoloX.CodeQuality.Playwright.E2ETest/SoloX.CodeQuality.Playwright.E2ETest.csproj +++ b/src/tests/SoloX.CodeQuality.Playwright.E2ETest/SoloX.CodeQuality.Playwright.E2ETest.csproj @@ -7,7 +7,7 @@ - net8.0 + net9.0 enable enable @@ -26,10 +26,16 @@ - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/tests/SoloX.CodeQuality.Test.Helpers.NUnit.UTest/SoloX.CodeQuality.Test.Helpers.NUnit.UTest.csproj b/src/tests/SoloX.CodeQuality.Test.Helpers.NUnit.UTest/SoloX.CodeQuality.Test.Helpers.NUnit.UTest.csproj index 93de53b..4a3539b 100644 --- a/src/tests/SoloX.CodeQuality.Test.Helpers.NUnit.UTest/SoloX.CodeQuality.Test.Helpers.NUnit.UTest.csproj +++ b/src/tests/SoloX.CodeQuality.Test.Helpers.NUnit.UTest/SoloX.CodeQuality.Test.Helpers.NUnit.UTest.csproj @@ -7,18 +7,18 @@ - net8.0 + net9.0 enable false - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/tests/SoloX.CodeQuality.Test.Helpers.UTest/SoloX.CodeQuality.Test.Helpers.UTest.csproj b/src/tests/SoloX.CodeQuality.Test.Helpers.UTest/SoloX.CodeQuality.Test.Helpers.UTest.csproj index 48a5ee9..47cc766 100644 --- a/src/tests/SoloX.CodeQuality.Test.Helpers.UTest/SoloX.CodeQuality.Test.Helpers.UTest.csproj +++ b/src/tests/SoloX.CodeQuality.Test.Helpers.UTest/SoloX.CodeQuality.Test.Helpers.UTest.csproj @@ -7,20 +7,20 @@ - net8.0 + net9.0 false - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/tests/SoloX.CodeQuality.Test.Helpers.XUnit.UTest/SoloX.CodeQuality.Test.Helpers.XUnit.UTest.csproj b/src/tests/SoloX.CodeQuality.Test.Helpers.XUnit.UTest/SoloX.CodeQuality.Test.Helpers.XUnit.UTest.csproj index 2644d76..977f029 100644 --- a/src/tests/SoloX.CodeQuality.Test.Helpers.XUnit.UTest/SoloX.CodeQuality.Test.Helpers.XUnit.UTest.csproj +++ b/src/tests/SoloX.CodeQuality.Test.Helpers.XUnit.UTest/SoloX.CodeQuality.Test.Helpers.XUnit.UTest.csproj @@ -7,21 +7,21 @@ - net8.0 + net9.0 enable false - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all