Drop .NET6+7; Target only .NET8+9; Switch from dotnet-format to csharpier (#103)

Author: hf-kklein

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpier": {
+      "version": "0.30.6",
+      "commands": [
+        "dotnet-csharpier"
+      ],
+      "rollForward": false
+    }
+  }
+}

.github/workflows/dependabot-automerge.yml

@@ -12,7 +12,18 @@ jobs:
       GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
+      - uses: actions/checkout@v4
+      - name: Verify commit signature.
+        run: |
+          curl -s https://github.com/web-flow.gpg | gpg --import
+          echo "Imported GitHub keys."
+          
+          echo "Verifying signature of commit: $GITHUB_SHA"
+          if ! git verify-commit "$GITHUB_SHA"; then
+            echo "Commit signature verification failed."
+            exit 1
+          fi
       - name: Approve a PR
         run: gh pr review --approve "$PR_URL"
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --squash "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"

.github/workflows/formatter.yml

@@ -1,4 +1,4 @@
-name: dotnet-format
+name: csharpier
 
 on: [push, pull_request]
 
@@ -7,13 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .NET
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.100
-      - name: Install dotnet-format
-        run: |
-          dotnet tool install -g dotnet-format
-      - name: Run dotnet-format
-        working-directory: ./TransformerBeeClient
-        run: dotnet-format TransformerBeeClient.sln --check
+      - name: Restore .NET tools
+        run: dotnet tool restore
+      - name: Run CSharpier
+        run: dotnet csharpier . --check

.github/workflows/integrationtests.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        dotnet-version: ["6.0.201", "7.0.100", "8.0.100"]
+        dotnet-version: ["9"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
@@ -25,13 +25,13 @@ jobs:
       - name: Log into registry
         # GHCR_PAT is a personal access token for the Github Container Registry; You can create it using the following steps:
         # 1) Go to https://github.com/settings/tokens
-        # 2) Create a new token (classic as of 2024-01-31)
+        # 2) Create a new token (classic as of 2025-04-02)
         # 3) Select the following scopes: read:packages
         # GHCR_USR is the username for the Github Container Registry; it has to match the PAT and is the username of the Github account that created the PAT
         # You can update the tokens in the repository settings:
         # https://github.com/Hochfrequenz/transformer.bee_client.net/settings/secrets/actions/GHCR_PAT
         # https://github.com/Hochfrequenz/transformer.bee_client.net/settings/secrets/actions/GHCR_USR
-        # Tokens will expire 2025-01-31
+        # Tokens will expire 2026-04-01
         run: echo "${{ secrets.GHCR_PAT }}" | docker login ghcr.io -u ${{ secrets.GHCR_USR }} --password-stdin
       - name: Start containers
         run: docker compose -f "TransformerBeeClient/TransformerBeeClient.IntegrationTest/docker-compose.yml" up -d

.github/workflows/release_nuget.yml

@@ -12,20 +12,20 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9
       - name: Build/Check for compile errors (dotnet build)
         working-directory: "TransformerBeeClient"
         run: dotnet build --configuration Release
       - name: Log into registry
         # GHCR_PAT is a personal access token for the Github Container Registry; You can create it using the following steps:
         # 1) Go to https://github.com/settings/tokens
-        # 2) Create a new token (classic as of 2024-01-31)
+        # 2) Create a new token (classic as of 2025-04-02)
         # 3) Select the following scopes: read:packages
         # GHCR_USR is the username for the Github Container Registry; it has to match the PAT and is the username of the Github account that created the PAT
         # You can update the tokens in the repository settings:
         # https://github.com/Hochfrequenz/transformer.bee_client.net/settings/secrets/actions/GHCR_PAT
         # https://github.com/Hochfrequenz/transformer.bee_client.net/settings/secrets/actions/GHCR_USR
-        # Tokens will expire 2025-01-31
+        # Tokens will expire 2026-04-01
         run: echo "${{ secrets.GHCR_PAT }}" | docker login ghcr.io -u ${{ secrets.GHCR_USR }} --password-stdin
       - name: Start containers
         run: docker compose -f "TransformerBeeClient/TransformerBeeClient.IntegrationTest/docker-compose.yml" up -d

.github/workflows/unittests.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        dotnet-version: ["6.0.201", "7.0.100", "8.0.100"]
+        dotnet-version: ["9"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code

TransformerBeeClient/ExampleAspNetCoreApplication.Test/ApplicationTest.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using FluentAssertions;
@@ -20,10 +20,10 @@ public ApplicationTest(WebApplicationFactory<Program> factory)
     public async Task Test_That_Setup_Works_As_Designed()
     {
         var client = Factory.CreateDefaultClient();
-        var response = await client.GetAsync("/talkToTransformerBee");
-        response.StatusCode.Should().Be(HttpStatusCode.OK);
-        var content = await response.Content.ReadAsStringAsync();
-        var bo4e = JsonSerializer.Deserialize<BOneyComb>(content, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } });
+        var bo4e = await client.GetFromJsonAsync<BOneyComb>(
+            "/talkToTransformerBee",
+            new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } }
+        );
         bo4e.Should().NotBeNull();
     }
 }

TransformerBeeClient/ExampleAspNetCoreApplication.Test/ExampleAspNetCoreApplication.Test.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

TransformerBeeClient/ExampleAspNetCoreApplication.Test/GlobalUsings.cs

@@ -1 +1 @@
-global using Xunit;
+global using Xunit;

TransformerBeeClient/ExampleAspNetCoreApplication/ExampleAspNetCoreApplication.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <PreserveCompilationContext>true</PreserveCompilationContext>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\TransformerBeeClient\TransformerBeeClient.csproj"/>