From 526c4455d59627afbde342c3d3882b51217ade15 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Sat, 6 Jan 2024 17:01:19 -0600 Subject: [PATCH] chore: adding net8.0 target to Prism.Core & Prism.Wpf --- .github/workflows/build_core.yml | 1 + .github/workflows/build_wpf.yml | 1 + .github/workflows/ci.yml | 2 ++ src/Prism.Core/Prism.Core.csproj | 4 ++-- src/Prism.Events/Prism.Events.csproj | 4 ++-- src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj | 4 ++-- src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj | 4 ++-- src/Wpf/Prism.Wpf/Prism.Wpf.csproj | 2 +- .../Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj | 2 +- .../Prism.IocContainer.Wpf.Tests.Support.csproj | 2 +- .../Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj | 2 +- tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj | 7 ++++++- 12 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_core.yml b/.github/workflows/build_core.yml index 7b2a3a22e3..b12f4e97ed 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: 8.0.x diff --git a/.github/workflows/build_wpf.yml b/.github/workflows/build_wpf.yml index 1399ea5b64..5d3f6edb20 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: 8.0.x diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc236c8f78..5418dad58e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,7 @@ jobs: with: name: Build Prism.Core solution-path: PrismLibrary_Core.slnf + dotnet-version: 8.0.x code-sign: true artifact-name: Core secrets: @@ -35,6 +36,7 @@ jobs: with: name: Build Prism.Wpf solution-path: PrismLibrary_Wpf.slnf + dotnet-version: 8.0.x code-sign: true artifact-name: Wpf secrets: diff --git a/src/Prism.Core/Prism.Core.csproj b/src/Prism.Core/Prism.Core.csproj index 4645786a66..37daa1642a 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 + netstandard2.0;net462;net47;net6.0;net8.0 Prism Prism.Core Prism diff --git a/src/Prism.Events/Prism.Events.csproj b/src/Prism.Events/Prism.Events.csproj index 2411d17913..b1df4c7796 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 + netstandard2.0;net462;net47;net6.0;net8.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..32f85ead98 100644 --- a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj +++ b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj @@ -1,8 +1,8 @@ - + - net462;net47;net6.0-windows + net462;net47;net6.0-windows;net8.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..d3575f0980 100644 --- a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj +++ b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj @@ -1,8 +1,8 @@ - + - net462;net47;net6.0-windows + net462;net47;net6.0-windows;net8.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..02c4ba05fc 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;net6.0-windows;net8.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/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj index da17ee6127..43e2fc236a 100644 --- a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj +++ b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj @@ -2,7 +2,7 @@ - net472 + net472;net8.0-windows false diff --git a/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj b/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj index 0152221328..bb02954e69 100644 --- a/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj +++ b/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj @@ -2,7 +2,7 @@ - net472 + net472;net8.0-windows diff --git a/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj b/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj index b3c47ff7e3..d940e64d4a 100644 --- a/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj +++ b/tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj @@ -2,7 +2,7 @@ - net472 + net472;net8.0-windows false diff --git a/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj b/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj index 209f213d9a..ef7e8935dc 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj +++ b/tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj @@ -1,7 +1,7 @@  - net472 + net472;net8.0-windows false @@ -65,4 +65,9 @@ + + + + +