From a46702633b448b41054a296117ed6e9f21bc03e5 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Wed, 12 Nov 2025 16:47:32 -0600 Subject: [PATCH 1/8] Updates projects to target .NET 10 Updates the target framework of several projects to .NET 10. This ensures compatibility and takes advantage of the latest .NET features. Updates package versions to align with the target framework update. --- .github/workflows/build_avalonia.yml | 1 + .github/workflows/build_core.yml | 1 + .github/workflows/build_maui.yml | 1 + .github/workflows/build_uno.yml | 2 +- .github/workflows/build_wpf.yml | 1 + .github/workflows/ci.yml | 8 ++- Directory.Packages.props | 62 ++++++++++--------- .../PrismAvaloniaDemo.csproj | 2 +- e2e/Maui/MauiModule/MauiModule.csproj | 2 +- .../MauiRegionsModule.csproj | 2 +- e2e/Maui/PrismMauiDemo/PrismMauiDemo.csproj | 4 +- e2e/Uno/Directory.Build.props | 2 +- .../HelloWorld.Bootstrapper.csproj | 2 +- .../HelloWorld.Core/HelloWorld.Core.csproj | 2 +- e2e/Wpf/HelloWorld/HelloWorld.csproj | 2 +- .../HelloWorld.Modules.ModuleA.csproj | 2 +- global.json | 2 +- .../Prism.Avalonia/Prism.Avalonia.csproj | 8 +-- .../Prism.DryIoc.Avalonia.csproj | 4 +- src/Directory.Build.props | 5 +- .../Prism.DryIoc.Maui.csproj | 2 +- src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj | 2 +- src/Maui/Prism.Maui/Prism.Maui.csproj | 4 +- src/Prism.Core/Prism.Core.csproj | 2 +- src/Prism.Events/Prism.Events.csproj | 2 +- .../Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj | 2 +- .../Prism.Unity.Wpf/Prism.Unity.Wpf.csproj | 2 +- src/Wpf/Prism.Wpf/Prism.Wpf.csproj | 2 +- .../Prism.Avalonia.Tests.csproj | 2 +- .../Prism.DryIoc.Avalonia.Tests.csproj | 2 +- ...IocContainer.Avalonia.Tests.Support.csproj | 2 +- .../Prism.DryIoc.Maui.Tests.csproj | 2 +- .../Prism.Maui.Tests/Prism.Maui.Tests.csproj | 2 +- .../Prism.Core.Tests/Prism.Core.Tests.csproj | 2 +- 34 files changed, 78 insertions(+), 67 deletions(-) diff --git a/.github/workflows/build_avalonia.yml b/.github/workflows/build_avalonia.yml index a12254c8f6..a763e9556a 100644 --- a/.github/workflows/build_avalonia.yml +++ b/.github/workflows/build_avalonia.yml @@ -23,3 +23,4 @@ jobs: with: name: Build Prism.Avalonia solution-path: PrismLibrary_Avalonia.slnf + dotnet-version: 10.0.100 diff --git a/.github/workflows/build_core.yml b/.github/workflows/build_core.yml index 6facbfa901..40fad7178b 100644 --- a/.github/workflows/build_core.yml +++ b/.github/workflows/build_core.yml @@ -21,3 +21,4 @@ jobs: with: name: Build Prism.Core solution-path: PrismLibrary_Core.slnf + dotnet-version: 10.0.100 diff --git a/.github/workflows/build_maui.yml b/.github/workflows/build_maui.yml index 80725015ac..f7e8e6b6f6 100644 --- a/.github/workflows/build_maui.yml +++ b/.github/workflows/build_maui.yml @@ -25,3 +25,4 @@ jobs: name: Build Prism.Maui solution-path: PrismLibrary_Maui.slnf install-workload: maui maui-tizen + dotnet-version: 10.0.100 diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml index 8fd3baae04..36cd3f5cda 100644 --- a/.github/workflows/build_uno.yml +++ b/.github/workflows/build_uno.yml @@ -26,7 +26,7 @@ jobs: name: Build Prism.Uno solution-path: PrismLibrary_Uno.slnf windows-sdk-version: 18362 - dotnet-version: 8.0.300 + dotnet-version: 10.0.100 install-workload: ios android macos maccatalyst wasm-tools uno-check: false uno-check-version: 1.25.1 diff --git a/.github/workflows/build_wpf.yml b/.github/workflows/build_wpf.yml index 6da41c003b..78b7d06b83 100644 --- a/.github/workflows/build_wpf.yml +++ b/.github/workflows/build_wpf.yml @@ -23,3 +23,4 @@ jobs: with: name: Build Prism.Wpf solution-path: PrismLibrary_Wpf.slnf + dotnet-version: 10.0.100 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d689bdc937..5a666f4b75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,7 @@ jobs: solution-path: PrismLibrary_Core.slnf code-sign: true artifact-name: Core + dotnet-version: 10.0.100 secrets: codeSignKeyVault: ${{ secrets.CodeSignKeyVault }} codeSignClientId: ${{ secrets.CodeSignClientId }} @@ -45,6 +46,7 @@ jobs: solution-path: PrismLibrary_Wpf.slnf code-sign: true artifact-name: Wpf + dotnet-version: 10.0.100 secrets: codeSignKeyVault: ${{ secrets.CodeSignKeyVault }} codeSignClientId: ${{ secrets.CodeSignClientId }} @@ -58,7 +60,7 @@ jobs: name: Build Prism.Uno solution-path: PrismLibrary_Uno.slnf windows-sdk-version: 18362 - dotnet-version: 8.0.300 + dotnet-version: 10.0.100 install-workload: ios android macos maccatalyst wasm-tools uno-check: false uno-check-version: 1.24.0 @@ -81,6 +83,7 @@ jobs: install-workload: maui maui-tizen code-sign: true artifact-name: Maui + dotnet-version: 10.0.100 secrets: codeSignKeyVault: ${{ secrets.CodeSignKeyVault }} codeSignClientId: ${{ secrets.CodeSignClientId }} @@ -95,6 +98,7 @@ jobs: solution-path: PrismLibrary_Avalonia.slnf code-sign: true artifact-name: Avalonia + dotnet-version: 10.0.100 secrets: codeSignKeyVault: ${{ secrets.CodeSignKeyVault }} codeSignClientId: ${{ secrets.CodeSignClientId }} @@ -167,4 +171,4 @@ jobs: name: Deploy Commercial Plus secrets: feedUrl: ${{ secrets.PRISM_NUGET_FEED }} - apiKey: ${{ secrets.PRISM_NUGET_TOKEN }} \ No newline at end of file + apiKey: ${{ secrets.PRISM_NUGET_TOKEN }} diff --git a/Directory.Packages.props b/Directory.Packages.props index d8264df734..48852edca5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,7 +11,10 @@ - + + - - + + - - + + - + - - - - - + + + + + - - + + - - - - + + + + - - + + + - - - - - - - - - + + + + + + + + + @@ -96,7 +100,7 @@ - + diff --git a/e2e/Avalonia/PrismAvaloniaDemo/PrismAvaloniaDemo.csproj b/e2e/Avalonia/PrismAvaloniaDemo/PrismAvaloniaDemo.csproj index b90410dc08..6c0c67e5d3 100644 --- a/e2e/Avalonia/PrismAvaloniaDemo/PrismAvaloniaDemo.csproj +++ b/e2e/Avalonia/PrismAvaloniaDemo/PrismAvaloniaDemo.csproj @@ -1,7 +1,7 @@  WinExe - net8.0 + net10.0 latest enable true diff --git a/e2e/Maui/MauiModule/MauiModule.csproj b/e2e/Maui/MauiModule/MauiModule.csproj index 17eebbf71a..e8703f975a 100644 --- a/e2e/Maui/MauiModule/MauiModule.csproj +++ b/e2e/Maui/MauiModule/MauiModule.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false true diff --git a/e2e/Maui/MauiRegionsModule/MauiRegionsModule.csproj b/e2e/Maui/MauiRegionsModule/MauiRegionsModule.csproj index 17eebbf71a..e8703f975a 100644 --- a/e2e/Maui/MauiRegionsModule/MauiRegionsModule.csproj +++ b/e2e/Maui/MauiRegionsModule/MauiRegionsModule.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false true diff --git a/e2e/Maui/PrismMauiDemo/PrismMauiDemo.csproj b/e2e/Maui/PrismMauiDemo/PrismMauiDemo.csproj index 4226d9a8ae..ae57a6971d 100644 --- a/e2e/Maui/PrismMauiDemo/PrismMauiDemo.csproj +++ b/e2e/Maui/PrismMauiDemo/PrismMauiDemo.csproj @@ -1,8 +1,8 @@ - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041 + net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041 Exe PrismMauiDemo true diff --git a/e2e/Uno/Directory.Build.props b/e2e/Uno/Directory.Build.props index a0276367b3..7bda23a255 100644 --- a/e2e/Uno/Directory.Build.props +++ b/e2e/Uno/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable enable true diff --git a/e2e/Wpf/HelloWorld.Bootstraper/HelloWorld.Bootstrapper.csproj b/e2e/Wpf/HelloWorld.Bootstraper/HelloWorld.Bootstrapper.csproj index 10de18462f..e22f854e88 100644 --- a/e2e/Wpf/HelloWorld.Bootstraper/HelloWorld.Bootstrapper.csproj +++ b/e2e/Wpf/HelloWorld.Bootstraper/HelloWorld.Bootstrapper.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows;net462 + net10.0-windows;net462 true HelloWorld ..\HelloWorld\prism-sandbox.ico diff --git a/e2e/Wpf/HelloWorld.Core/HelloWorld.Core.csproj b/e2e/Wpf/HelloWorld.Core/HelloWorld.Core.csproj index d5749ef11f..a9ca4f3093 100644 --- a/e2e/Wpf/HelloWorld.Core/HelloWorld.Core.csproj +++ b/e2e/Wpf/HelloWorld.Core/HelloWorld.Core.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net462 + net10.0-windows;net462 true diff --git a/e2e/Wpf/HelloWorld/HelloWorld.csproj b/e2e/Wpf/HelloWorld/HelloWorld.csproj index da5afa4048..3bfd58d1c1 100644 --- a/e2e/Wpf/HelloWorld/HelloWorld.csproj +++ b/e2e/Wpf/HelloWorld/HelloWorld.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows;net462 + net10.0-windows;net462 true HelloWorld HelloWorld diff --git a/e2e/Wpf/Modules/HelloWorld.Modules.ModuleA/HelloWorld.Modules.ModuleA.csproj b/e2e/Wpf/Modules/HelloWorld.Modules.ModuleA/HelloWorld.Modules.ModuleA.csproj index 67471f38fd..8fb3629763 100644 --- a/e2e/Wpf/Modules/HelloWorld.Modules.ModuleA/HelloWorld.Modules.ModuleA.csproj +++ b/e2e/Wpf/Modules/HelloWorld.Modules.ModuleA/HelloWorld.Modules.ModuleA.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net462 + net10.0-windows;net462 true diff --git a/global.json b/global.json index b5b460407f..d4a3f1e307 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.56", "MSBuild.Sdk.Extras": "3.0.44", - "Uno.Sdk": "5.3.31" + "Uno.Sdk": "6.4.20" } } diff --git a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj index 5ada70059d..33ef49d356 100644 --- a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj +++ b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj @@ -3,7 +3,7 @@ Properties Prism - net6.0;net7.0;net8.0 + net9.0;net10.0 Prism.Avalonia is a fully open source version of the Prism guidance originally produced by Microsoft Patterns & Practices. Prism.Avalonia provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (Avalonia, WPF, Uno Platform, and Xamarin Forms). Prism.Avalonia helps you more easily design and build rich, flexible, and easy to maintain cross-platform Avalonia desktop applications. This library provides user interface composition as well as modularity support. @@ -11,11 +11,11 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t Prism.Avalonia - + @@ -37,7 +37,7 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t - + diff --git a/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj b/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj index 2f6b60c4a7..259e672f21 100644 --- a/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj +++ b/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj @@ -2,10 +2,8 @@ Prism.DryIoc - net6.0;net7.0;net8.0 + net9.0;net10.0 This extension is used to build Prism.Avalonia applications based on DryIoc. Users must install the Prism.Avalonia NuGet package as well. - Damian Suess, Suess Labs, various contributors - Copyright (c) 2024 Xeno Innovations, Inc. Prism.DryIoc.Avalonia README.md prism;mvvm;xaml;avalonia;dryioc;dependencyinjection;navigation;dialog;prismavalonia; diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b43e833fa0..614dc79a49 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -25,8 +25,9 @@ - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos - $(UnoTargetFrameworks);net8.0-windows10.0.19041 + net9.0;net9.0-android;net9.0-ios;net9.0-tvos;net9.0-desktop;net9.0-browserwasm + $(UnoTargetFrameworks);net10.0;net10.0-android;net10.0-ios;net10.0-tvos;net10.0-desktop;net10.0-browserwasm + $(UnoTargetFrameworks);net9.0-windows10.0.19041;net10.0-windows10.0.19041 win-x64;win-x86;win-arm64 diff --git a/src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj b/src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj index 46086e22f1..69dac56900 100644 --- a/src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj +++ b/src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0;net10.0 true true true diff --git a/src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj b/src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj index 1685fe7734..586360026e 100644 --- a/src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj +++ b/src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0;net10.0 true Prism.Maui.Rx is a support package for .NET MAUI developers. This package provides some helpers to access an IObservable for globally handling Navigation Request Results. true diff --git a/src/Maui/Prism.Maui/Prism.Maui.csproj b/src/Maui/Prism.Maui/Prism.Maui.csproj index d27c27cc50..f1ff72abad 100644 --- a/src/Maui/Prism.Maui/Prism.Maui.csproj +++ b/src/Maui/Prism.Maui/Prism.Maui.csproj @@ -1,8 +1,8 @@ - net8.0;net8.0-android;net8.0-ios; - $(TargetFrameworks);net8.0-windows10.0.19041 + net9.0;net9.0-android;net9.0-ios;net10.0;net10.0-android;net10.0-ios; + $(TargetFrameworks);net8.0-windows10.0.19041;net9.0-windows10.0.19041;net10.0-windows10.0.19041 Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, .NET MAUI and Xamarin Forms). Prism for .NET MAUI helps you more easily design and build rich, flexible, and easy to maintain .NET MAUI applications. This library provides user interface composition as well as modularity support. diff --git a/src/Prism.Core/Prism.Core.csproj b/src/Prism.Core/Prism.Core.csproj index 4645786a66..3f60a09227 100644 --- a/src/Prism.Core/Prism.Core.csproj +++ b/src/Prism.Core/Prism.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net462;net47;net6.0 + net462;net47;net8.0;net9.0;net10.0 Prism Prism.Core Prism diff --git a/src/Prism.Events/Prism.Events.csproj b/src/Prism.Events/Prism.Events.csproj index 2411d17913..c71e11f669 100644 --- a/src/Prism.Events/Prism.Events.csproj +++ b/src/Prism.Events/Prism.Events.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net462;net47;net6.0 + net462;net47;net8.0;net9.0;net10.0 Prism.Events is a library that facilitates communication between loosely coupled components in an application. It provides an event aggregator service that allows publishers and subscribers to interact through events without direct references. With multicast publish/subscribe functionality, multiple publishers can raise the same event, and multiple subscribers can listen to it, enabling flexible and efficient communication. diff --git a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj index 3fdd5fdfe2..9c2a378b79 100644 --- a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj +++ b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj @@ -2,7 +2,7 @@ - net462;net47;net6.0-windows + net462;net47;net8.0-windows;net9.0-windows;net10.0-windows true Prism.DryIoc Prism.DryIoc diff --git a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj index 4e7f8a93e9..e23c26a2de 100644 --- a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj +++ b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj @@ -2,7 +2,7 @@ - net462;net47;net6.0-windows + net462;net47;net8.0-windows;net9.0-windows;net10.0-windows true Prism.Unity Prism.Unity diff --git a/src/Wpf/Prism.Wpf/Prism.Wpf.csproj b/src/Wpf/Prism.Wpf/Prism.Wpf.csproj index 3bb40f223a..95e5cb355d 100644 --- a/src/Wpf/Prism.Wpf/Prism.Wpf.csproj +++ b/src/Wpf/Prism.Wpf/Prism.Wpf.csproj @@ -4,7 +4,7 @@ Properties Prism - net462;net47;net6.0-windows + net462;net47;net8.0-windows;net9.0-windows;net10.0-windows true Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, .NET MAUI and Xamarin Forms). diff --git a/tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj b/tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj index 96e305474e..81c0008422 100644 --- a/tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj +++ b/tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false enable false diff --git a/tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj b/tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj index bccbbb065b..632b77e8ce 100644 --- a/tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj +++ b/tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false diff --git a/tests/Avalonia/Prism.IocContainer.Avalonia.Tests.Support/Prism.IocContainer.Avalonia.Tests.Support.csproj b/tests/Avalonia/Prism.IocContainer.Avalonia.Tests.Support/Prism.IocContainer.Avalonia.Tests.Support.csproj index 7040cf1449..11e19f86dc 100644 --- a/tests/Avalonia/Prism.IocContainer.Avalonia.Tests.Support/Prism.IocContainer.Avalonia.Tests.Support.csproj +++ b/tests/Avalonia/Prism.IocContainer.Avalonia.Tests.Support/Prism.IocContainer.Avalonia.Tests.Support.csproj @@ -2,7 +2,7 @@ - net8.0 + net10.0 diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj b/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj index b699f1ef82..e1d10a1651 100644 --- a/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj +++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj b/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj index 321157cdfd..53596e5546 100644 --- a/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj +++ b/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/tests/Prism.Core.Tests/Prism.Core.Tests.csproj b/tests/Prism.Core.Tests/Prism.Core.Tests.csproj index 0be9112c9f..0f4e49e126 100644 --- a/tests/Prism.Core.Tests/Prism.Core.Tests.csproj +++ b/tests/Prism.Core.Tests/Prism.Core.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net10.0 false From 841edce691ba8bc42dc97db6029613c5ffcc99f5 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Wed, 12 Nov 2025 17:38:28 -0600 Subject: [PATCH 2/8] Updates Maui controls version for .NET 10 Updates the Microsoft.Maui.Controls package version to 10.0.10 for .NET 10 targets in Maui projects. This ensures that the projects use the correct Maui version when targeting .NET 10. It also temporarily removes conditional package versioning from Directory.Packages.props which is now handled within the project files themselves. --- Directory.Packages.props | 4 ++-- .../Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj | 14 +++++++++++++- src/Maui/Prism.Maui.Rx/Prism.Maui.Rx.csproj | 14 +++++++++++++- src/Maui/Prism.Maui/Prism.Maui.csproj | 17 ++++++++++++++--- .../Prism.DryIoc.Maui.Tests.csproj | 2 +- .../Prism.Maui.Tests/Prism.Maui.Tests.csproj | 2 +- 6 files changed, 44 insertions(+), 9 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 48852edca5..7c2576ce29 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,13 +10,13 @@ - +