From 97dfb826e6a928827b3eb99b523a25379dd7a1fa Mon Sep 17 00:00:00 2001 From: Tony Troeff Date: Wed, 19 Feb 2025 00:15:26 +0200 Subject: [PATCH 1/8] Upgraded all package references --- ...oftware.Extensions.Collections.Tests.csproj | 18 +++++++++--------- ...TryAtSoftware.Extensions.Collections.csproj | 4 ++-- ...s.DependencyInjection.Standard.Tests.csproj | 18 +++++++++--------- ...ensions.DependencyInjection.Standard.csproj | 8 ++++++-- ...Extensions.DependencyInjection.Tests.csproj | 16 ++++++++-------- ...tware.Extensions.DependencyInjection.csproj | 2 +- ...ware.Extensions.Reflection.Benchmark.csproj | 4 ++-- ...Software.Extensions.Reflection.Tests.csproj | 18 +++++++++--------- .../TryAtSoftware.Extensions.Reflection.csproj | 2 +- 9 files changed, 47 insertions(+), 43 deletions(-) diff --git a/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj b/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj index 7b8aa60..47aa005 100644 --- a/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj +++ b/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net7.0;net8.0 + netcoreapp3.1;net7.0;net8.0;net9.0 latest enable @@ -10,26 +10,26 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - - + + diff --git a/TryAtSoftware.Extensions.Collections/TryAtSoftware.Extensions.Collections.csproj b/TryAtSoftware.Extensions.Collections/TryAtSoftware.Extensions.Collections.csproj index baf0b64..55dd980 100644 --- a/TryAtSoftware.Extensions.Collections/TryAtSoftware.Extensions.Collections.csproj +++ b/TryAtSoftware.Extensions.Collections/TryAtSoftware.Extensions.Collections.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net7.0;net8.0 + netstandard2.1;net7.0 latest enable @@ -18,7 +18,7 @@ - + diff --git a/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj b/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj index 5d18588..8643980 100644 --- a/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj @@ -1,7 +1,7 @@  - net7.0;net8.0 + net7.0;net8.0;net9.0 enable enable @@ -10,24 +10,24 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/TryAtSoftware.Extensions.DependencyInjection.Standard/TryAtSoftware.Extensions.DependencyInjection.Standard.csproj b/TryAtSoftware.Extensions.DependencyInjection.Standard/TryAtSoftware.Extensions.DependencyInjection.Standard.csproj index e0b3d76..868997f 100644 --- a/TryAtSoftware.Extensions.DependencyInjection.Standard/TryAtSoftware.Extensions.DependencyInjection.Standard.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection.Standard/TryAtSoftware.Extensions.DependencyInjection.Standard.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0 + netstandard2.1;net8.0;net9.0 latest enable @@ -18,7 +18,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -33,6 +33,10 @@ + + + + diff --git a/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj b/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj index 4a9a25f..6954e53 100644 --- a/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj @@ -10,23 +10,23 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/TryAtSoftware.Extensions.DependencyInjection/TryAtSoftware.Extensions.DependencyInjection.csproj b/TryAtSoftware.Extensions.DependencyInjection/TryAtSoftware.Extensions.DependencyInjection.csproj index 3cf48e0..474132d 100644 --- a/TryAtSoftware.Extensions.DependencyInjection/TryAtSoftware.Extensions.DependencyInjection.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection/TryAtSoftware.Extensions.DependencyInjection.csproj @@ -18,7 +18,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TryAtSoftware.Extensions.Reflection.Benchmark/TryAtSoftware.Extensions.Reflection.Benchmark.csproj b/TryAtSoftware.Extensions.Reflection.Benchmark/TryAtSoftware.Extensions.Reflection.Benchmark.csproj index 588e98a..ec7c972 100644 --- a/TryAtSoftware.Extensions.Reflection.Benchmark/TryAtSoftware.Extensions.Reflection.Benchmark.csproj +++ b/TryAtSoftware.Extensions.Reflection.Benchmark/TryAtSoftware.Extensions.Reflection.Benchmark.csproj @@ -1,14 +1,14 @@ - net7.0 + net9.0 Exe enable enable - + diff --git a/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj b/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj index e428868..5e4739e 100644 --- a/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj +++ b/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net7.0;net8.0;net9.0 enable false @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/TryAtSoftware.Extensions.Reflection/TryAtSoftware.Extensions.Reflection.csproj b/TryAtSoftware.Extensions.Reflection/TryAtSoftware.Extensions.Reflection.csproj index 27e8662..71b8dd1 100644 --- a/TryAtSoftware.Extensions.Reflection/TryAtSoftware.Extensions.Reflection.csproj +++ b/TryAtSoftware.Extensions.Reflection/TryAtSoftware.Extensions.Reflection.csproj @@ -18,7 +18,7 @@ - + From b6f9a9241e412a868d3c746fb7b4e15b81e165fd Mon Sep 17 00:00:00 2001 From: Tony Troeff Date: Wed, 19 Feb 2025 00:15:53 +0200 Subject: [PATCH 2/8] Added support for .NET 9 for the `TryAtSoftware.Extensions.DependencyInjection` library. --- .../TryAtSoftware.Extensions.DependencyInjection.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj b/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj index 6954e53..cdb9038 100644 --- a/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net7.0;net8.0;net9.0 enable enable From 9bffc4be13cd9b29214ec6ddd009fbfcd60e1bf4 Mon Sep 17 00:00:00 2001 From: Tony Troeff Date: Wed, 19 Feb 2025 00:18:58 +0200 Subject: [PATCH 3/8] Updated all workflow definitions --- .github/workflows/Core validation.yml | 3 ++- .github/workflows/Publish packages.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Core validation.yml b/.github/workflows/Core validation.yml index 4d56d1d..296b539 100644 --- a/.github/workflows/Core validation.yml +++ b/.github/workflows/Core validation.yml @@ -27,8 +27,9 @@ jobs: 3.1.x 7.x 8.x + 9.x - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: microsoft diff --git a/.github/workflows/Publish packages.yml b/.github/workflows/Publish packages.yml index ce031b0..f0e9528 100644 --- a/.github/workflows/Publish packages.yml +++ b/.github/workflows/Publish packages.yml @@ -25,6 +25,7 @@ jobs: 3.1.x 7.x 8.x + 9.x - name: Restore dependencies run: dotnet restore From 2fb70b94095a5714582e9d8d135e27f574845c99 Mon Sep 17 00:00:00 2001 From: Tonyslav Troeff Date: Wed, 19 Feb 2025 22:05:41 +0200 Subject: [PATCH 4/8] Update Core validation.yml --- .github/workflows/Core validation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Core validation.yml b/.github/workflows/Core validation.yml index 296b539..080579f 100644 --- a/.github/workflows/Core validation.yml +++ b/.github/workflows/Core validation.yml @@ -16,12 +16,12 @@ jobs: CONFIGURATION: Release steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 3.1.x @@ -30,7 +30,7 @@ jobs: 9.x - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: microsoft java-version: 17 From 85e861cf042e54474d022856a01018ea839f263c Mon Sep 17 00:00:00 2001 From: Tonyslav Troeff Date: Wed, 19 Feb 2025 22:05:57 +0200 Subject: [PATCH 5/8] Update Publish packages.yml --- .github/workflows/Publish packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Publish packages.yml b/.github/workflows/Publish packages.yml index f0e9528..a815803 100644 --- a/.github/workflows/Publish packages.yml +++ b/.github/workflows/Publish packages.yml @@ -14,12 +14,12 @@ jobs: NUGET_SOURCE: https://api.nuget.org/v3/index.json steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 3.1.x From 11a3a333cde6ab2917a1f5597716c5febdf874b0 Mon Sep 17 00:00:00 2001 From: Tonyslav Troeff Date: Wed, 19 Feb 2025 22:18:27 +0200 Subject: [PATCH 6/8] Trying to collect test coverage without the necessity of `coverlet.msbuild` --- .github/workflows/Core validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Core validation.yml b/.github/workflows/Core validation.yml index 080579f..7ef454d 100644 --- a/.github/workflows/Core validation.yml +++ b/.github/workflows/Core validation.yml @@ -64,7 +64,7 @@ jobs: run: dotnet build --no-restore --configuration "${{ env.CONFIGURATION }}" - name: Test the solution - run: dotnet test --no-build --configuration "${{ env.CONFIGURATION }}" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover + run: dotnet test --no-build --configuration "${{ env.CONFIGURATION }}" --collect "XPlat Code Coverage;Format=opencover" - name: Finalize analyzation with SonarCloud run: ./.sonar/scanner/dotnet-sonarscanner end ${{ env.SONAR_ARGS }} From 4e0f37318838833ce10c118e98b1e52de0b14987 Mon Sep 17 00:00:00 2001 From: Tony Troeff Date: Wed, 19 Feb 2025 22:29:28 +0200 Subject: [PATCH 7/8] Removed coverlet.msbuild references and started using `net6.0` instead of `netcoreapp3.1` because of linux-specific issues during CI --- .../TryAtSoftware.Extensions.Collections.Tests.csproj | 6 +----- ...are.Extensions.DependencyInjection.Standard.Tests.csproj | 4 ---- ...ryAtSoftware.Extensions.DependencyInjection.Tests.csproj | 4 ---- .../TryAtSoftware.Extensions.Reflection.Tests.csproj | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj b/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj index 47aa005..b044f86 100644 --- a/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj +++ b/TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0 latest enable @@ -10,10 +10,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - all diff --git a/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj b/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj index 8643980..b24243e 100644 --- a/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj @@ -10,10 +10,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj b/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj index cdb9038..c733b7e 100644 --- a/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj +++ b/TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj @@ -10,10 +10,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj b/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj index 5e4739e..b3d1c40 100644 --- a/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj +++ b/TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj @@ -9,7 +9,6 @@ - From 682f725a6a40b8ec3c807960926fda0cfdb4152b Mon Sep 17 00:00:00 2001 From: Tony Troeff Date: Wed, 19 Feb 2025 22:32:43 +0200 Subject: [PATCH 8/8] Added a step to the workflow files necessary for downloading .net6 --- .github/workflows/Core validation.yml | 2 +- .github/workflows/Publish packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Core validation.yml b/.github/workflows/Core validation.yml index 7ef454d..b7d68f5 100644 --- a/.github/workflows/Core validation.yml +++ b/.github/workflows/Core validation.yml @@ -24,7 +24,7 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 3.1.x + 6.x 7.x 8.x 9.x diff --git a/.github/workflows/Publish packages.yml b/.github/workflows/Publish packages.yml index a815803..1684176 100644 --- a/.github/workflows/Publish packages.yml +++ b/.github/workflows/Publish packages.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 3.1.x + 6.x 7.x 8.x 9.x