Skip to content

Commit

Permalink
chore: adding net8.0 target to Prism.Core & Prism.Wpf
Browse files Browse the repository at this point in the history
  • Loading branch information
dansiegel committed Jan 6, 2024
1 parent e7058ca commit e2a3f0d
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ jobs:
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
dotnet-version: 8.0.x
1 change: 1 addition & 0 deletions .github/workflows/build_wpf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ jobs:
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
dotnet-version: 8.0.x
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/Prism.Core/Prism.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;net47;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net47;net6.0;net8.0</TargetFrameworks>
<AssemblyName>Prism</AssemblyName>
<PackageId>Prism.Core</PackageId>
<RootNamespace>Prism</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/Prism.Events/Prism.Events.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;net47;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net47;net6.0;net8.0</TargetFrameworks>
<!-- Summary is not actually supported at this time. Including the summary for future support. -->
<!--<Summary>Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable applications.</Summary>-->
<Description>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.</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net461;net47;net6.0-windows;net8.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<RootNamespace>Prism.DryIoc</RootNamespace>
<PackageId>Prism.DryIoc</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net461;net47;net6.0-windows;net8.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<RootNamespace>Prism.Unity</RootNamespace>
<PackageId>Prism.Unity</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.Wpf/Prism.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Prism</RootNamespace>
<TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net461;net47;net6.0-windows;net8.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<!--<Summary>Prism libraries related to user interface composition, regions, and modularity for WPF.</Summary>-->
<Description>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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
7 changes: 6 additions & 1 deletion tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -65,4 +65,9 @@
</Resource>
</ItemGroup>

<ItemGroup Condition=" !$(TargetFramework.StartsWith('net4')) ">
<!-- TODO: Update for proper .NET 8 testing -->
<Compile Remove="Modularity/DirectoryModuleCatalogFixture.Desktop.cs" />
</ItemGroup>

</Project>

0 comments on commit e2a3f0d

Please sign in to comment.