From d36241f44d3d3be92d17387aa4b01b5f924d59ea Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Sat, 14 Nov 2026 00:59:57 +0000 Subject: [PATCH 1/2] Add net11.0 targets alongside net10.0, update NuGet packages and CI SDKs --- .github/workflows/ci.yml | 4 +++- .github/workflows/release.yml | 4 +++- CLAUDE.md | 6 +++--- DSoft.Messaging/DSoft.MessageBus.csproj | 17 +++++++++-------- README.md | 2 +- UnitTest/UnitTest.csproj | 10 +++++----- WPFSample/WPFSample.csproj | 4 ++-- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42838e2..766bca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,9 @@ jobs: - uses: actions/setup-dotnet@v6 with: - dotnet-version: '10.x' + dotnet-version: | + 10.x + 11.x - name: Restore workloads run: dotnet workload restore DSoft.Messaging/DSoft.MessageBus.csproj diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a88d71b..ccbb015 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,9 @@ jobs: - uses: actions/setup-dotnet@v6 with: - dotnet-version: '10.x' + dotnet-version: | + 10.x + 11.x - name: Version id: version diff --git a/CLAUDE.md b/CLAUDE.md index 0c63e09..20b175e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -8,12 +8,12 @@ DSoft.MessageBus is a cross-platform EventBus/messaging library (like `NSNotific ## Build & Test -Solution file is `MessageBus.slnx` (new XML solution format — requires recent .NET 10 SDK / VS). +Solution file is `MessageBus.slnx` (new XML solution format — requires recent .NET 11 SDK / VS). ```bash dotnet restore MessageBus.slnx dotnet build MessageBus.slnx --configuration Release -dotnet test UnitTest/UnitTest.csproj # tests target net10.0, MSTest +dotnet test UnitTest/UnitTest.csproj # tests target net10.0 and net11.0, MSTest dotnet test UnitTest/UnitTest.csproj --filter "FullyQualifiedName~MessageBusTest.MethodName" # single test ``` @@ -41,7 +41,7 @@ Both routes hit the same `MessageBusService` logic. ### Platform-specific compilation `DSoft.Messaging` uses **filename-suffix conventions** instead of one file per TFM — the `.csproj` includes files by suffix via `EnableDefaultCompileItems=false`: - `*.shared.cs` — all targets -- `*.netstandard.cs` — netstandard/net8/net10/net472 +- `*.netstandard.cs` — netstandard/net8/net10/net11/net472 - `*.wpf.cs` (windows7.0), `*.winui.cs` (windows10), `*.android.cs`, `*.ios.cs` (ios+maccatalyst), `*.mac.cs` (macos), `*.tvos.cs` `ThreadControl` is the main example: `ThreadControl.shared.cs` defines the public API and calls `partial` members (`PlatformIsMainThread`, `PlatformBeginInvokeOnMainThread`) implemented per platform. When adding platform-specific code, add a new `*..cs` partial rather than `#if`. (ThreadControl's `MainThread` logic is adapted from Xamarin.Essentials.) diff --git a/DSoft.Messaging/DSoft.MessageBus.csproj b/DSoft.Messaging/DSoft.MessageBus.csproj index cbb5248..bae0525 100644 --- a/DSoft.Messaging/DSoft.MessageBus.csproj +++ b/DSoft.Messaging/DSoft.MessageBus.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net8.0;net10.0;net10.0-ios;net10.0-macos;net10.0-maccatalyst;net10.0-tvos;net10.0-android; - $(TargetFrameworks);net472;net8.0-windows7.0;net10.0-windows7.0;net10.0-windows10.0.19041; + netstandard2.1;net8.0;net10.0;net11.0;net10.0-ios;net11.0-ios;net10.0-macos;net11.0-macos;net10.0-maccatalyst;net11.0-maccatalyst;net10.0-tvos;net11.0-tvos;net10.0-android;net11.0-android; + $(TargetFrameworks);net472;net8.0-windows7.0;net10.0-windows7.0;net11.0-windows7.0;net10.0-windows10.0.19041;net11.0-windows10.0.19041; DSoft.MessageBus DSoft.MessageBus DSoft Developments @@ -25,8 +25,8 @@ 15.0 14.0 $(NoWarn);NETSDK1206;CA1416; - Updated to .NET 10 and latest dependencies - Removed .NET 9 targets (.NET 8 and .NET 10 LTS remain supported) + Added .NET 11 targets alongside .NET 10 and updated dependencies + .NET 8 and .NET 10 LTS remain supported @@ -59,7 +59,7 @@ - + @@ -70,8 +70,8 @@ - - + + @@ -99,7 +99,8 @@ - + + diff --git a/README.md b/README.md index f217c22..d5c13a2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ MessageBus is a cross platform EventBus system similar to `NSNoticationCenter` o # Features * Cross-platform - * .NETStandard 2.1, .NET Framework 4.7.2, .NET 8 and .NET 10 including iOS, tvOS, Android, Mac Catalyst, macOS and Windows with support for WPF and WinUI + * .NETStandard 2.1, .NET Framework 4.7.2, .NET 8, .NET 10 and .NET 11 including iOS, tvOS, Android, Mac Catalyst, macOS and Windows with support for WPF and WinUI * Small footprint * Simple API * Create custom events to easily pass additional data diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj index de536f9..b44d0b1 100644 --- a/UnitTest/UnitTest.csproj +++ b/UnitTest/UnitTest.csproj @@ -1,7 +1,7 @@ - net10.0 + net10.0;net11.0 enable enable False @@ -15,10 +15,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/WPFSample/WPFSample.csproj b/WPFSample/WPFSample.csproj index 7993a8b..cf44960 100644 --- a/WPFSample/WPFSample.csproj +++ b/WPFSample/WPFSample.csproj @@ -2,7 +2,7 @@ WinExe - net10.0-windows + net10.0-windows;net11.0-windows true False False @@ -10,7 +10,7 @@ - + From a7e3da13828f02737031830262604cf5a2208707 Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Sat, 14 Nov 2026 19:19:18 +0000 Subject: [PATCH 2/2] Raise minimum Android version to 24 for net11.0-android --- DSoft.Messaging/DSoft.MessageBus.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/DSoft.Messaging/DSoft.MessageBus.csproj b/DSoft.Messaging/DSoft.MessageBus.csproj index bae0525..b32579d 100644 --- a/DSoft.Messaging/DSoft.MessageBus.csproj +++ b/DSoft.Messaging/DSoft.MessageBus.csproj @@ -21,6 +21,7 @@ 14.2 15.0 21.0 + 24.0 6.5 15.0 14.0