From 630dbeeb9af88a3601c66dea67fee5c4c1e05afd Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Sat, 14 Nov 2026 22:35:44 +0000 Subject: [PATCH 1/2] Add net11.0 targets alongside net10.0 Add net11.0 to the core, UI, hosting, WPF, WinUI and MAUI libraries, use 11.x Microsoft.Extensions and MAUI packages for the net11.0 targets (10.0.15 / 10.0.130 for the others), move SourceLink to 11.0.100, and install the 10.x and 11.x SDKs in the CI and release workflows. Microsoft.Maui.Controls.Compatibility has no stable 11.x release so it is only referenced for the net10.0 targets. --- .github/workflows/ci.yml | 4 +++- .github/workflows/release.yml | 4 +++- AGENTS.md | 2 +- .../DSoft.System.Mvvm.Hosting.csproj | 13 ++++++++++--- .../DSoft.System.Mvvm.SourceGenerators.csproj | 2 +- .../DSoft.System.Mvvm.UI.MAUI.csproj | 19 ++++++++++++------- Directory.Build.props | 6 +++--- README.md | 4 ++-- .../DSoft.System.Mvvm.UI.WinUI.csproj | 15 +++++++++++---- .../DSoft.System.Mvvm.UI.WPF.csproj | 15 +++++++++++---- System.Mvvm.UI.Wpf/readme.md | 2 ++ System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj | 9 +++++++-- System.Mvvm.Ui/readme.md | 4 ++-- System.Mvvm/DSoft.System.Mvvm.csproj | 2 +- System.Mvvm/readme.md | 4 ++-- 15 files changed, 71 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc8dd3d..8818d7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,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 System.Mvvm.slnx diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 782fdbf..a9608fe 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/AGENTS.md b/AGENTS.md index eb4d9bc..559c36c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -23,7 +23,7 @@ dotnet build System.Mvvm.slnx -c Release - No unit test project exists; `MVVMSample` (WPF) and `MauiSample` are the manual runnable samples. - Multi-targeted builds (especially MAUI/WinUI) require workloads: `dotnet workload restore`. - CI is GitHub Actions (`.github/workflows/`): `ci.yml` builds Release for pull requests into `main` or `development` and publishes nothing; `release.yml` runs on every push to `main` (changes only to Markdown or workflow files are skipped; run it by hand to test a workflow change), builds Release as `3.6..` plus `RELEASE_SUFFIX` (empty for a stable version, set it to `-prerelease` in the workflow to publish a prerelease), uploads the packages as the `drop` artifact, pushes them to nuget.org with Trusted Publishing (OIDC, `NUGET_USER` secret, `nuget` environment), then tags the commit `v` and creates a GitHub release with the packages attached. -- The core library targets `netstandard2.0;net10.0`. Platform UI libs add windows-specific TFMs (e.g. `net462;net10.0-windows7.0;net10.0-windows10.0.18362.0;...`). +- The core library targets `netstandard2.0;net10.0;net11.0`. Platform UI libs add windows-specific TFMs (e.g. `net462;net10.0-windows7.0;net10.0-windows10.0.18362.0;net11.0-windows7.0;net11.0-windows10.0.18362.0;...`). Install both the .NET 10 and .NET 11 SDKs. - Assemblies are strong-named/signed (`DSoft.snk`); `Release` builds enable SourceLink and pack symbols. `GeneratePackageOnBuild` is on, so building produces `.nupkg` files. ## Shared build configuration diff --git a/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj b/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj index fce808a..844186a 100644 --- a/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj +++ b/DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj @@ -5,7 +5,7 @@ Microsoft.Extensions.Hosting helper library and System.Mvvm extensions MVVM Microsoft.Extensions.Hosting helper library and System.Mvvm extensions - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + Added .NET 11 support alongside .NET 10 and updated packages. System.Mvvm.Hosting System.Mvvm $(AssemblyName) ($(TargetFramework)) @@ -19,7 +19,14 @@ - + + + + + + + + @@ -27,7 +34,7 @@ - + diff --git a/DSoft.System.Mvvm.SourceGenerators/DSoft.System.Mvvm.SourceGenerators.csproj b/DSoft.System.Mvvm.SourceGenerators/DSoft.System.Mvvm.SourceGenerators.csproj index 0d0675e..06d7feb 100644 --- a/DSoft.System.Mvvm.SourceGenerators/DSoft.System.Mvvm.SourceGenerators.csproj +++ b/DSoft.System.Mvvm.SourceGenerators/DSoft.System.Mvvm.SourceGenerators.csproj @@ -7,7 +7,7 @@ Source generators library for DSoft.System.Mvvm MVVM SourceGenerators Source generators for DSoft.System.Mvvm - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + Added .NET 11 support alongside .NET 10 and updated packages. System.Mvvm.SourceGenerators $(AssemblyName) ($(TargetFramework)) readme.md diff --git a/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj b/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj index 32f9f56..7cffb19 100644 --- a/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj +++ b/DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj @@ -1,8 +1,8 @@  - net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst - $(TargetFrameworks);net10.0-windows10.0.19041.0 + net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst;net11.0;net11.0-android;net11.0-ios;net11.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0;net11.0-windows10.0.19041.0 true @@ -11,7 +11,7 @@ true DSoft.System.Mvvm.UI.MAUI MAUI platform support for System.Mvvm.UI - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + Added .NET 11 support alongside .NET 10 and updated packages. MAUI NET System.Mvvm.UI.MAUI $(AssemblyName) ($(TargetFramework)) @@ -27,10 +27,15 @@ true - - - - + + + + + + + + + diff --git a/Directory.Build.props b/Directory.Build.props index 8d3c33c..d8b2b60 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - netstandard2.0;net10.0; + netstandard2.0;net10.0;net11.0; true true false @@ -14,7 +14,7 @@ Latest Debug;Release 1701;1702;CS8002;NETSDK1206; - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + Added .NET 11 support alongside .NET 10 and updated packages. README.md DSIcon.png @@ -40,7 +40,7 @@ - + diff --git a/README.md b/README.md index ac498b2..aab230b 100644 --- a/README.md +++ b/README.md @@ -85,12 +85,12 @@ To create a notifiable property create a property with a backing field using the - [WPF](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.WPF) - .NET Framework 4.6.2 and above - .NET 10 and above - - Windows 10 and above is supported for both net10.0-windows7.0 and net10.0-windows10.0.18362.0 target framework monikers (TFMs) incase you want to use the Windows 10 SDK in your WPF app. + - Windows 10 and above is supported for both net10.0/net11.0-windows7.0 and net10.0/net11.0-windows10.0.18362.0 target framework monikers (TFMs) incase you want to use the Windows 10 SDK in your WPF app. - [WinUI](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.WinUI) - WinUI 3 using Windows App SDK 1.0 or above on .NET 10 - Windows 10 version 2004 (19041) and above - [MAUI](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.MAUI) - - .NET 10 (net10.0, Android, iOS, MacCatalyst and Windows 10.0.19041.0) + - .NET 10 and .NET 11 (net10.0/net11.0, Android, iOS, MacCatalyst and Windows 10.0.19041.0) - [Visual Studio Extensibility](https://www.nuget.org/packages/DSoft.System.Mvvm.VisualStudio.Extensibility.UI) - VisualStudio.Extensibility SDK on .NET 8 (Windows) diff --git a/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj b/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj index 9f0f4cf..7d3a12f 100644 --- a/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj +++ b/System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj @@ -1,9 +1,9 @@  - net10.0-windows10.0.19041; + net10.0-windows10.0.19041;net11.0-windows10.0.19041; DSoft.System.Mvvm.UI.WinUI - WinUI 3 platform support for System.Mvvm.UI for .NET 10+ - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + WinUI 3 platform support for System.Mvvm.UI for .NET 10 and .NET 11+ + Added .NET 11 support alongside .NET 10 and updated packages. WinUI .NET System.Mvvm.UI.WinUI $(AssemblyName) ($(TargetFramework)) @@ -47,6 +47,13 @@ - + + + + + + + + \ No newline at end of file diff --git a/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj b/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj index 219c0ff..ab304b6 100644 --- a/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj +++ b/System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj @@ -1,10 +1,10 @@  - net462;net10.0-windows7.0;net10.0-windows10.0.18362.0; + net462;net10.0-windows7.0;net10.0-windows10.0.18362.0;net11.0-windows7.0;net11.0-windows10.0.18362.0; true DSoft.System.Mvvm.UI.WPF - WPF platform support for DSoft.System.Mvvm.UI for .NET Framework 4.6.2 and .NET 10+ - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + WPF platform support for DSoft.System.Mvvm.UI for .NET Framework 4.6.2 and .NET 10 and .NET 11+ + Added .NET 11 support alongside .NET 10 and updated packages. WPF MVVM NetCore System.Mvvm.UI.WPF $(AssemblyName) ($(TargetFramework)) @@ -17,6 +17,13 @@ - + + + + + + + + \ No newline at end of file diff --git a/System.Mvvm.UI.Wpf/readme.md b/System.Mvvm.UI.Wpf/readme.md index 30d6fd9..4ac6f70 100644 --- a/System.Mvvm.UI.Wpf/readme.md +++ b/System.Mvvm.UI.Wpf/readme.md @@ -14,8 +14,10 @@ Provides WPF (.NET Framework 4.6.2 and .NET 10 and above) platform implementatio There are two Target Framework Monikers (TFMs) that are supported for Windows 10 and above when using .NET 10 or above, depending on if your application is using the Windows 10/11 SDK. - net10.0-windows7.0 + - net11.0-windows7.0 - Works with Windows 7, 8, 8.1, 10 and 11 - net10.0-windows10.0.18362.0 + - net11.0-windows10.0.18362.0 - Works with Windows 10 1903 (18362) and above only to access the Windows 10/11 SDK # Using System.Mvvm.UI.WPF diff --git a/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj b/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj index cc3ae3f..91810ff 100644 --- a/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj +++ b/System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj @@ -3,7 +3,7 @@ true DSoft.System.Mvvm.Ui Core UI library for System.Mvvm.UI - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + Added .NET 11 support alongside .NET 10 and updated packages. UI MVVM System.Mvvm.Ui $(AssemblyName) ($(TargetFramework)) @@ -13,7 +13,12 @@ - + + + + + + diff --git a/System.Mvvm.Ui/readme.md b/System.Mvvm.Ui/readme.md index 40d46fa..a68e49e 100644 --- a/System.Mvvm.Ui/readme.md +++ b/System.Mvvm.Ui/readme.md @@ -58,12 +58,12 @@ Using DI instead of the `UI` does not require a call to `MvvmManager.Init` thoug - [WPF](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.WPF) - .NET Framework 4.6.2 and above - .NET 10 and above - - Windows 10 is supported for both net10.0-windows7.0 and net10.0-windows10.0.18362.0 target framework monikers (TFMs) incase you want to use the Windows 10 SDK in your WPF app. + - Windows 10 is supported for both net10.0/net11.0-windows7.0 and net10.0/net11.0-windows10.0.18362.0 target framework monikers (TFMs) incase you want to use the Windows 10 SDK in your WPF app. - [WinUI](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.WinUI) - WinUI using Windows App SDK 1.0 or above on .NET 10 - Windows 10 version 2004 (19041) and above - [MAUI](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.MAUI) - - .NET 10 (net10.0, Android, iOS, MacCatalyst and Windows 10.0.19041.0) + - .NET 10 and .NET 11 (net10.0/net11.0, Android, iOS, MacCatalyst and Windows 10.0.19041.0) ### MvvmManager `MvvmManager` is a class that is found in the platform packages for `Dsoft.System.Mvvm.UI` and registers the standard UI implementation for each platform. diff --git a/System.Mvvm/DSoft.System.Mvvm.csproj b/System.Mvvm/DSoft.System.Mvvm.csproj index cd8dfa4..8088c6a 100644 --- a/System.Mvvm/DSoft.System.Mvvm.csproj +++ b/System.Mvvm/DSoft.System.Mvvm.csproj @@ -4,7 +4,7 @@ Core MVVM library for .Net MVVM Powerful Cross-platform MVVM class library for .NET 10, .NET Framework, WPF, WinUI 3 and MAUI - Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements. + Added .NET 11 support alongside .NET 10 and updated packages. System.Mvvm System.Mvvm $(AssemblyName) ($(TargetFramework)) diff --git a/System.Mvvm/readme.md b/System.Mvvm/readme.md index 55b0149..d545d35 100644 --- a/System.Mvvm/readme.md +++ b/System.Mvvm/readme.md @@ -85,11 +85,11 @@ To create a notifiable property create a property with a backing field using the - [WPF](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.WPF) - .NET Framework 4.6.2 and above - .NET 10 and above - - Windows 10 and above is supported for both net10.0-windows7.0 and net10.0-windows10.0.18362.0 target framework monikers (TFMs) incase you want to use the Windows 10 SDK in your WPF app. + - Windows 10 and above is supported for both net10.0/net11.0-windows7.0 and net10.0/net11.0-windows10.0.18362.0 target framework monikers (TFMs) incase you want to use the Windows 10 SDK in your WPF app. - [WinUI](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.WinUI) - WinUI 3 using Windows App SDK 1.0 or above on .NET 10 - Windows 10 version 2004 (19041) and above - [MAUI](https://www.nuget.org/packages/DSoft.System.Mvvm.UI.MAUI) - - .NET 10 (net10.0, Android, iOS, MacCatalyst and Windows 10.0.19041.0) + - .NET 10 and .NET 11 (net10.0/net11.0, Android, iOS, MacCatalyst and Windows 10.0.19041.0) - [Visual Studio Extensibility](https://www.nuget.org/packages/DSoft.System.Mvvm.VisualStudio.Extensibility.UI) - VisualStudio.Extensibility SDK on .NET 8 (Windows) \ No newline at end of file From 1c12d31658f1a047b11e5501941fb3f9a093bcee Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Sat, 14 Nov 2026 23:06:20 +0000 Subject: [PATCH 2/2] Align MauiSample package versions with the MAUI library The library now references 10.0.130 / 10.0.15 for net10.0 targets, so the sample's older pins caused NU1605 package downgrade errors. --- MauiSample/MauiSample.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MauiSample/MauiSample.csproj b/MauiSample/MauiSample.csproj index 064326b..2500cc1 100644 --- a/MauiSample/MauiSample.csproj +++ b/MauiSample/MauiSample.csproj @@ -64,9 +64,9 @@ - - - + + +