Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.<yyMM>.<run number>` 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<version>` 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
Expand Down
13 changes: 10 additions & 3 deletions DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Summary>Microsoft.Extensions.Hosting helper library and System.Mvvm extensions</Summary>
<PackageTags>MVVM</PackageTags>
<Description>Microsoft.Extensions.Hosting helper library and System.Mvvm extensions</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<AssemblyName>System.Mvvm.Hosting</AssemblyName>
<RootNamespace>System.Mvvm</RootNamespace>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
Expand All @@ -19,15 +19,22 @@
<Compile Include="**\*.shared.*.cs" />
<Compile Include="HostMode.cs" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.12" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.Equals('net11.0'))">
<PackageReference Include="Microsoft.Extensions.Hosting" Version="11.0.0" />
</ItemGroup>

<ItemGroup Condition=" !$(TargetFramework.Equals('net11.0'))">
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.15" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.Equals('netstandard2.0'))">
<Compile Include="**\*.netstandard.cs" />
<Compile Include="**\*.netstandard.*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.Equals('net10.0'))">
<ItemGroup Condition=" $(TargetFramework.Equals('net10.0')) Or $(TargetFramework.Equals('net11.0'))">
<Compile Include="**\*.net.cs" />
<Compile Include="**\*.net.*.cs" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Summary>Source generators library for DSoft.System.Mvvm</Summary>
<PackageTags>MVVM SourceGenerators</PackageTags>
<Description>Source generators for DSoft.System.Mvvm</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<AssemblyName>System.Mvvm.SourceGenerators</AssemblyName>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<PackageReadmeFile>readme.md</PackageReadmeFile>
Expand Down
19 changes: 12 additions & 7 deletions DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst;net11.0;net11.0-android;net11.0-ios;net11.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0;net11.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
<UseMaui>true</UseMaui>
Expand All @@ -11,7 +11,7 @@
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PackageId>DSoft.System.Mvvm.UI.MAUI</PackageId>
<Description>MAUI platform support for System.Mvvm.UI</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<PackageTags>MAUI NET</PackageTags>
<AssemblyName>System.Mvvm.UI.MAUI</AssemblyName>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
Expand All @@ -27,10 +27,15 @@
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.110" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.110" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.12" />
<ItemGroup Condition=" $(TargetFramework.StartsWith('net11.0')) ">
<PackageReference Include="Microsoft.Maui.Controls" Version="11.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="11.0.0" />
</ItemGroup>

<ItemGroup Condition=" !$(TargetFramework.StartsWith('net11.0')) ">
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.130" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.130" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.15" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net10.0;</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net10.0;net11.0;</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand All @@ -14,7 +14,7 @@
<LangVersion>Latest</LangVersion>
<Configurations>Debug;Release</Configurations>
<NoWarn>1701;1702;CS8002;NETSDK1206;</NoWarn>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>DSIcon.png</PackageIcon>
</PropertyGroup>
Expand All @@ -40,7 +40,7 @@
</PropertyGroup>

<ItemGroup Condition=" '$(Configuration)'=='Release'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="11.0.100" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true' Or '$(TF_BUILD)' == 'true'">
Expand Down
6 changes: 3 additions & 3 deletions MauiSample/MauiSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.110" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.110" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.12" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.130" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.130" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.15" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
15 changes: 11 additions & 4 deletions System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0-windows10.0.19041;</TargetFrameworks>
<TargetFrameworks>net10.0-windows10.0.19041;net11.0-windows10.0.19041;</TargetFrameworks>
<PackageId>DSoft.System.Mvvm.UI.WinUI</PackageId>
<Description>WinUI 3 platform support for System.Mvvm.UI for .NET 10+</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<Description>WinUI 3 platform support for System.Mvvm.UI for .NET 10 and .NET 11+</Description>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<PackageTags>WinUI .NET</PackageTags>
<AssemblyName>System.Mvvm.UI.WinUI</AssemblyName>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
Expand Down Expand Up @@ -47,6 +47,13 @@
<ItemGroup>
<ProjectReference Include="..\System.Mvvm.Ui\DSoft.System.Mvvm.UI.csproj" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net11.0'))">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0" />
</ItemGroup>

<ItemGroup Condition=" !$(TargetFramework.StartsWith('net11.0'))">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.15" />
</ItemGroup>
</Project>
15 changes: 11 additions & 4 deletions System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net10.0-windows7.0;net10.0-windows10.0.18362.0;</TargetFrameworks>
<TargetFrameworks>net462;net10.0-windows7.0;net10.0-windows10.0.18362.0;net11.0-windows7.0;net11.0-windows10.0.18362.0;</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PackageId>DSoft.System.Mvvm.UI.WPF</PackageId>
<Description>WPF platform support for DSoft.System.Mvvm.UI for .NET Framework 4.6.2 and .NET 10+</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<Description>WPF platform support for DSoft.System.Mvvm.UI for .NET Framework 4.6.2 and .NET 10 and .NET 11+</Description>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<PackageTags>WPF MVVM NetCore</PackageTags>
<AssemblyName>System.Mvvm.UI.WPF</AssemblyName>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
Expand All @@ -17,6 +17,13 @@
<None Include="readme.md" Pack="true" PackagePath="\" />
<ProjectReference Include="..\System.Mvvm.Ui\DSoft.System.Mvvm.UI.csproj" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net11.0'))">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0" />
</ItemGroup>

<ItemGroup Condition=" !$(TargetFramework.StartsWith('net11.0'))">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.15" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions System.Mvvm.UI.Wpf/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PackageId>DSoft.System.Mvvm.Ui</PackageId>
<Description>Core UI library for System.Mvvm.UI</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<PackageTags>UI MVVM</PackageTags>
<AssemblyName>System.Mvvm.Ui</AssemblyName>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
Expand All @@ -13,7 +13,12 @@
<ItemGroup>
<None Include="readme.md" Pack="true" PackagePath="\" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net11.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.15" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="System.Mvvm.UI.WinUI, PublicKey=002400000480000094000000060200000024000052534131000400000100010085529aa44bb5b76cfba9f8f376ec13c1503e7e38ee7b236b946df8c17b6f24d11609eea05229320dd531dc92211156f2b9b7843b7791a680221bd4a358fb785b180fcd35731dc1b7cfaf2fc314b102b20896af562662dacd08d7d2d830a4a4cb84c6df91d7af56a6e5b46f0b65db4259bcac25bc7828791d65dfcefaefac7aad" />
Expand Down
4 changes: 2 additions & 2 deletions System.Mvvm.Ui/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion System.Mvvm/DSoft.System.Mvvm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Summary>Core MVVM library for .Net</Summary>
<PackageTags>MVVM</PackageTags>
<Description>Powerful Cross-platform MVVM class library for .NET 10, .NET Framework, WPF, WinUI 3 and MAUI</Description>
<PackageReleaseNotes>Updated to .NET 10 and latest packages. Removed .NET 8 and .NET 9 support. Performance improvements.</PackageReleaseNotes>
<PackageReleaseNotes>Added .NET 11 support alongside .NET 10 and updated packages.</PackageReleaseNotes>
<AssemblyName>System.Mvvm</AssemblyName>
<RootNamespace>System.Mvvm</RootNamespace>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
Expand Down
4 changes: 2 additions & 2 deletions System.Mvvm/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Loading