From a2c49ac93faff561240f8519f5421d8acda744f5 Mon Sep 17 00:00:00 2001 From: David Perfors Date: Wed, 18 Dec 2024 20:53:49 +0100 Subject: [PATCH 1/5] Remove .NET 6 support --- .github/workflows/ci.yml | 4 +--- CHANGELOG.md | 2 ++ src/TestableHttpClient/TestableHttpClient.csproj | 8 ++------ .../TestableHttpClient.IntegrationTests.csproj | 8 +------- .../TestableHttpClient.Tests.csproj | 2 +- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e60cae8..27826f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,6 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x 8.0.x 9.0.x include-prerelease: true @@ -45,7 +44,7 @@ jobs: - name: Build source code run: dotnet build --configuration Release --no-restore - name: Test with dotnet - run: dotnet test --configuration Release --no-build --collect="Code Coverage" --framework="net6.0" + run: dotnet test --configuration Release --no-build --collect="Code Coverage" --framework="net8.0" - name: Upload sonarqube results if: ${{ github.actor != 'dependabot[bot]' }} env: @@ -80,7 +79,6 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x 8.0.x 9.0.x include-prerelease: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 91f4e92..7240575 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [0.12] - unplanned +### Removed +- .NET 6.0 target, since it is no longer supported ### Added - Support for .NET 9.0 diff --git a/src/TestableHttpClient/TestableHttpClient.csproj b/src/TestableHttpClient/TestableHttpClient.csproj index 01b284e..1d99b75 100644 --- a/src/TestableHttpClient/TestableHttpClient.csproj +++ b/src/TestableHttpClient/TestableHttpClient.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0;net8.0;net9.0 + netstandard2.0;net8.0;net9.0 @@ -24,7 +24,7 @@ true snupkg full - + true https://github.com/testablehttpclient/TestableHttpClient git @@ -39,10 +39,6 @@ - - - - diff --git a/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj b/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj index 53f20cc..9f5f726 100644 --- a/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj +++ b/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj @@ -1,19 +1,13 @@  - net462;net47;net48;net6.0;net8.0;net9.0 + net462;net47;net48;net8.0;net9.0 - - - - - - diff --git a/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj b/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj index 1d7c36f..1dc6fe3 100644 --- a/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj +++ b/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj @@ -1,7 +1,7 @@ - net462;net47;net48;net6.0;net8.0;net9.0 + net462;net47;net48;net8.0;net9.0 From 302316343fa63357b8535a5fa3016347fc1c209b Mon Sep 17 00:00:00 2001 From: David Perfors Date: Wed, 18 Dec 2024 20:57:12 +0100 Subject: [PATCH 2/5] Update nuget packages --- .config/dotnet-tools.json | 6 +++--- src/TestableHttpClient/TestableHttpClient.csproj | 2 +- test/Directory.Build.targets | 3 +-- .../TestableHttpClient.Tests.csproj | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e6af3a7..a352993 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,18 +3,18 @@ "isRoot": true, "tools": { "dotnet-sonarscanner": { - "version": "9.0.0", + "version": "9.0.2", "commands": [ "dotnet-sonarscanner" ], "rollForward": false }, "nbgv": { - "version": "3.6.143", + "version": "3.7.112", "commands": [ "nbgv" ], "rollForward": false } } -} \ No newline at end of file +} diff --git a/src/TestableHttpClient/TestableHttpClient.csproj b/src/TestableHttpClient/TestableHttpClient.csproj index 1d99b75..1c462a4 100644 --- a/src/TestableHttpClient/TestableHttpClient.csproj +++ b/src/TestableHttpClient/TestableHttpClient.csproj @@ -44,7 +44,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 3f0e4b5..d87f3d0 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -1,8 +1,7 @@ - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj b/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj index 1dc6fe3..a808876 100644 --- a/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj +++ b/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj @@ -5,11 +5,11 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From b446f978e7328024608c6ede21d7a55768979b7c Mon Sep 17 00:00:00 2001 From: David Perfors Date: Sun, 22 Dec 2024 21:16:59 +0100 Subject: [PATCH 3/5] revert build machine --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27826f7..2695254 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: testOnSupportedDotnetVersions: strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-22.04, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -81,7 +81,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x - include-prerelease: true + include-prerelease: false - name: Dump .NET info run: dotnet --info - name: Restore dependencies From 6e66ccc555b9a08ff8762207e7db73df3f5b5853 Mon Sep 17 00:00:00 2001 From: David Perfors Date: Sun, 22 Dec 2024 21:29:29 +0100 Subject: [PATCH 4/5] Fix warnings --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2695254..00c3286 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: dotnet-version: | 8.0.x 9.0.x - include-prerelease: true - name: Dump .NET info run: dotnet --info - name: Restore dotnet tools @@ -81,7 +80,6 @@ jobs: dotnet-version: | 8.0.x 9.0.x - include-prerelease: false - name: Dump .NET info run: dotnet --info - name: Restore dependencies @@ -103,7 +101,6 @@ jobs: with: dotnet-version: | 9.0.x - include-prerelease: true - uses: actions/download-artifact@v4 with: name: artifacts From 9a467b8b6aaecfb3c3147e9488b8a108eb0e80ac Mon Sep 17 00:00:00 2001 From: David Perfors Date: Sun, 22 Dec 2024 21:35:27 +0100 Subject: [PATCH 5/5] Update codeql yaml and dependabot config --- .github/dependabot.yaml | 2 +- .github/workflows/codeql.yml | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 810812a..5ee4040 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -11,7 +11,7 @@ updates: reviewers: - "dnperfors" - package-ecosystem: "github-actions" - directory: ".github/" + directory: "/" schedule: interval: "daily" reviewers: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index de69e5f..a9e509b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,19 +19,17 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Fetch all history for all tags and branches run: git fetch --prune --unshallow - name: Setup .NET versions - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x 8.0.x 9.0.x - include-prerelease: true - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: queries: security-and-quality languages: csharp @@ -39,4 +37,4 @@ jobs: - name: Build source code run: dotnet build --configuration Release --framework net8.0 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3