Skip to content

Add support for .NET 9 #1287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pomianowski merged 1 commit into from
Dec 6, 2024
Merged

Add support for .NET 9 #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "WPF UI Docs Dev Container",
"image": "mcr.microsoft.com/dotnet/sdk:8.0",
"image": "mcr.microsoft.com/dotnet/sdk:9.0",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "20"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/top-issues-dashboard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Top issues action.
name: wpf-ui-top-issues-dashboard
on:
schedule:
- cron: '0 0 */1 * *'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wpf-ui-cd-docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: Setup .NET Core SDK 8.x
- name: Setup .NET Core SDK 9.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
dotnet-version: 9.x

- name: Install docfx
run: dotnet tool update -g docfx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wpf-ui-cd-extension.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [main]
paths:
- 'src/Wpf.Ui.Extension**`
- 'src/Wpf.Ui.Extension**'

workflow_dispatch:

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/wpf-ui-cd-nuget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: wpf-ui-cd-nuget
on:
push:
branches: [main]
paths:
- 'src/**'

workflow_dispatch:

Expand All @@ -17,10 +19,10 @@ jobs:
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 8.x
- name: Setup .NET Core SDK 9.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
dotnet-version: 9.x

- name: Fetch the certificate
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wpf-ui-pr-validator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 8.x
- name: Setup .NET Core SDK 9.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
dotnet-version: 9.x

- name: Install dependencies
run: dotnet restore
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<PropertyGroup>
<Version>4.0.0-rc.2</Version>
<Version>4.0.0-rc.3</Version>
<AssemblyVersion>4.0.0</AssemblyVersion>
</PropertyGroup>

Expand Down Expand Up @@ -41,7 +41,7 @@

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>12.0</LangVersion>
<LangVersion>13.0</LangVersion>
<Nullable>enable</Nullable>

<!--
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.Abstractions/Wpf.Ui.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>WPF-UI.Abstractions</PackageId>
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net6.0;net8.0;net9.0</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Abstractions for the WPF UI.</Description>
<CommonTags>$(CommonTags);abstractions;standard</CommonTags>
Expand Down
4 changes: 2 additions & 2 deletions src/Wpf.Ui.DependencyInjection/Wpf.Ui.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>WPF-UI.DependencyInjection</PackageId>
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net472;net6.0;net8.0;net9.0</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Dependency injection for the WPF UI.</Description>
<CommonTags>$(CommonTags);dependency;injection;abstractions;standard</CommonTags>
Expand All @@ -24,4 +24,4 @@
<ProjectReference Include="..\Wpf.Ui.Abstractions\Wpf.Ui.Abstractions.csproj" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Wpf.Ui.Gallery</RootNamespace>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
<UseWPF>true</UseWPF>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.SyntaxHighlight/Wpf.Ui.SyntaxHighlight.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>WPF-UI.SyntaxHighlight</PackageId>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<Description>Native tast notification support for WPF using the WPF UI library.</Description>
<CommonTags>$(CommonTags);syntax;highlight</CommonTags>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.ToastNotifications/Wpf.Ui.ToastNotifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>WPF-UI.ToastNotifications</PackageId>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<Description>Native tast notification support for WPF using the WPF UI library.</Description>
<CommonTags>$(CommonTags);toast;notifications</CommonTags>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>WPF-UI.Tray</PackageId>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<Description>Native tray menu icon support for WPF using the WPF UI library.</Description>
<CommonTags>$(CommonTags);tray;notifyicon;notify</CommonTags>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui/Wpf.Ui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>WPF-UI</PackageId>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net472;net481;net6.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>WPF UI provides the Fluent experience in your known and loved WPF framework. Intuitive design, themes, navigation and new immersive controls. All natively and effortlessly.</Description>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion tests/Wpf.Ui.Gallery.UnitTests/Wpf.Ui.Gallery.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Wpf.Ui.UnitTests/Wpf.Ui.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down