From 3b9111398d16db877618b23a66e64f9eb5fcf8b0 Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Mon, 16 Nov 2026 19:36:12 +0000 Subject: [PATCH] Add net11.0 target alongside net10.0, build with .NET 10 and 11 SDKs --- .github/workflows/build.yml | 12 +++++++----- .github/workflows/release.yml | 14 +++++++++----- CLAUDE.md | 4 ++-- .../DSoft.Portable.WebClient.Encryption.csproj | 14 ++++++++++---- ...DSoft.Portable.WebClient.Grpc.Extensions.csproj | 7 ++++++- .../DSoft.Portable.WebClient.Grpc.csproj | 8 ++++++++ .../DSoft.Portable.WebClient.Rest.csproj | 8 +++++++- Directory.Build.props | 4 ++-- SampleApiClient/SampleApiClient.csproj | 13 +++++++++---- SampleWebApp/SampleWebApp.csproj | 2 +- TestHarness/TestHarness.csproj | 4 ++-- UnitTester/UnitTester.csproj | 12 ++++++++++-- 12 files changed, 73 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f6a7a4..13667c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ -# Build and test pull requests into master +# Build and test pull requests into master and Development # (replaces azure-pipelines-mergetest.yml) name: Build on: pull_request: - branches: [ master ] + branches: [ master, Development ] workflow_dispatch: env: @@ -19,12 +19,14 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Install .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.x + dotnet-version: | + 10.x + 11.x - name: Restore packages run: dotnet restore ${{ env.SOLUTION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00b0ede..5201941 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,12 +49,14 @@ jobs: version: ${{ steps.version.outputs.version }}${{ env.RELEASE_SUFFIX }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Install .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.x + dotnet-version: | + 10.x + 11.x # Same scheme as the old Azure pipeline: {major}.{minor}.{yyMM}.{dd}{daily revision} - name: Calculate version @@ -117,9 +119,11 @@ jobs: path: artifacts - name: Install .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.x + dotnet-version: | + 10.x + 11.x - name: NuGet login (OIDC) id: login diff --git a/CLAUDE.md b/CLAUDE.md index 2be8af1..2b02727 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -20,7 +20,7 @@ dotnet test UnitTester/UnitTester.csproj --filter "FullyQualifiedName~TestClassN ## Architecture -This is a multi-project .NET library (targets `net462`, `net9.0`, `net10.0`) providing base classes for consuming ASP.NET Core REST APIs and gRPC services. All library projects share build settings from `Directory.Build.props` (NuGet packaging, signing via `DSoft.snk`, SourceLink on Release). +This is a multi-project .NET library (targets `net462`, `net9.0`, `net10.0` and `net11.0`; build with the .NET 10 and .NET 11 SDKs) providing base classes for consuming ASP.NET Core REST APIs and gRPC services. All library projects share build settings from `Directory.Build.props` (NuGet packaging, signing via `DSoft.snk`, SourceLink on Release). ### Package Dependency Graph @@ -74,7 +74,7 @@ All responses extend `ResponseBase` (`Success: bool`, `Message: string`). Concre ### Testing -Tests live in `UnitTester/` (MSTest, targets `net10.0`). Integration tests use `Microsoft.AspNetCore.Mvc.Testing` (`WebApplicationFactory`). The `SampleWebApp` project is the system under test; `SampleApiClient` contains the client implementation used in tests. Pass a custom `HttpMessageHandler` from the test factory into `RestApiClientOptions` or `GrpcClientOptions` to intercept HTTP traffic without a real server. +Tests live in `UnitTester/` (MSTest, targets `net10.0` and `net11.0`). Integration tests use `Microsoft.AspNetCore.Mvc.Testing` (`WebApplicationFactory`). The `SampleWebApp` project is the system under test; `SampleApiClient` contains the client implementation used in tests. Pass a custom `HttpMessageHandler` from the test factory into `RestApiClientOptions` or `GrpcClientOptions` to intercept HTTP traffic without a real server. ### Key Interfaces for Extension diff --git a/DSoft.Portable.WebClient.Encryption/DSoft.Portable.WebClient.Encryption.csproj b/DSoft.Portable.WebClient.Encryption/DSoft.Portable.WebClient.Encryption.csproj index bc21e13..dcea439 100644 --- a/DSoft.Portable.WebClient.Encryption/DSoft.Portable.WebClient.Encryption.csproj +++ b/DSoft.Portable.WebClient.Encryption/DSoft.Portable.WebClient.Encryption.csproj @@ -16,9 +16,15 @@ - - - - + + + + + + + + + + diff --git a/DSoft.Portable.WebClient.Grpc.Extensions/DSoft.Portable.WebClient.Grpc.Extensions.csproj b/DSoft.Portable.WebClient.Grpc.Extensions/DSoft.Portable.WebClient.Grpc.Extensions.csproj index 5d224b6..5329fcb 100644 --- a/DSoft.Portable.WebClient.Grpc.Extensions/DSoft.Portable.WebClient.Grpc.Extensions.csproj +++ b/DSoft.Portable.WebClient.Grpc.Extensions/DSoft.Portable.WebClient.Grpc.Extensions.csproj @@ -16,10 +16,15 @@ - + + + + + + diff --git a/DSoft.Portable.WebClient.Grpc/DSoft.Portable.WebClient.Grpc.csproj b/DSoft.Portable.WebClient.Grpc/DSoft.Portable.WebClient.Grpc.csproj index c472e97..3df19c3 100644 --- a/DSoft.Portable.WebClient.Grpc/DSoft.Portable.WebClient.Grpc.csproj +++ b/DSoft.Portable.WebClient.Grpc/DSoft.Portable.WebClient.Grpc.csproj @@ -19,7 +19,15 @@ + + + + + + + + diff --git a/DSoft.Portable.WebClient.Rest/DSoft.Portable.WebClient.Rest.csproj b/DSoft.Portable.WebClient.Rest/DSoft.Portable.WebClient.Rest.csproj index 620c085..b81305f 100644 --- a/DSoft.Portable.WebClient.Rest/DSoft.Portable.WebClient.Rest.csproj +++ b/DSoft.Portable.WebClient.Rest/DSoft.Portable.WebClient.Rest.csproj @@ -20,9 +20,15 @@ - + + + + + + + diff --git a/Directory.Build.props b/Directory.Build.props index fb0aac8..77b9c2c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net462;net9.0;net10.0; + net462;net9.0;net10.0;net11.0 true true false @@ -38,7 +38,7 @@ - + diff --git a/SampleApiClient/SampleApiClient.csproj b/SampleApiClient/SampleApiClient.csproj index f39e6f8..df318fa 100644 --- a/SampleApiClient/SampleApiClient.csproj +++ b/SampleApiClient/SampleApiClient.csproj @@ -1,15 +1,20 @@  - net10.0 + net10.0;net11.0 false false false - - - + + + + + + + + diff --git a/SampleWebApp/SampleWebApp.csproj b/SampleWebApp/SampleWebApp.csproj index a3d96a0..f4a982c 100644 --- a/SampleWebApp/SampleWebApp.csproj +++ b/SampleWebApp/SampleWebApp.csproj @@ -1,7 +1,7 @@  - net10.0 + net10.0;net11.0 false false false diff --git a/TestHarness/TestHarness.csproj b/TestHarness/TestHarness.csproj index ab7a0c9..a40d037 100644 --- a/TestHarness/TestHarness.csproj +++ b/TestHarness/TestHarness.csproj @@ -2,7 +2,7 @@ WinExe - net10.0-windows + net10.0-windows;net11.0-windows true false false @@ -21,7 +21,7 @@ - + diff --git a/UnitTester/UnitTester.csproj b/UnitTester/UnitTester.csproj index 6ca547d..c94bf1b 100644 --- a/UnitTester/UnitTester.csproj +++ b/UnitTester/UnitTester.csproj @@ -1,7 +1,7 @@  - net10.0 + net10.0;net11.0 enable false false @@ -11,7 +11,6 @@ - @@ -23,6 +22,15 @@ + + + + + + + + +