From 8fdf515d43375664884717e09cb7dc8a9bde470c Mon Sep 17 00:00:00 2001
From: Leszek Pomianowski <13592821+pomianowski@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:27:19 +0100
Subject: [PATCH] Add support for .NET 9

---
 .devcontainer/devcontainer.json                             | 2 +-
 .github/workflows/top-issues-dashboard.yml                  | 2 +-
 .github/workflows/wpf-ui-cd-docs.yaml                       | 4 ++--
 .github/workflows/wpf-ui-cd-extension.yaml                  | 2 +-
 .github/workflows/wpf-ui-cd-nuget.yaml                      | 6 ++++--
 .github/workflows/wpf-ui-pr-validator.yaml                  | 4 ++--
 Directory.Build.props                                       | 4 ++--
 src/Wpf.Ui.Abstractions/Wpf.Ui.Abstractions.csproj          | 2 +-
 .../Wpf.Ui.DependencyInjection.csproj                       | 4 ++--
 src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj              | 2 +-
 src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj                    | 2 +-
 src/Wpf.Ui.SyntaxHighlight/Wpf.Ui.SyntaxHighlight.csproj    | 2 +-
 .../Wpf.Ui.ToastNotifications.csproj                        | 2 +-
 src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj                          | 2 +-
 src/Wpf.Ui/Wpf.Ui.csproj                                    | 2 +-
 .../Wpf.Ui.Gallery.UnitTests.csproj                         | 2 +-
 tests/Wpf.Ui.UnitTests/Wpf.Ui.UnitTests.csproj              | 2 +-
 17 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0bf4a912c..b9e1e2ce1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -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"
diff --git a/.github/workflows/top-issues-dashboard.yml b/.github/workflows/top-issues-dashboard.yml
index 16185e714..f1c3ffbf6 100644
--- a/.github/workflows/top-issues-dashboard.yml
+++ b/.github/workflows/top-issues-dashboard.yml
@@ -1,4 +1,4 @@
-name: Top issues action.
+name: wpf-ui-top-issues-dashboard
 on:
   schedule:
     - cron: '0 0 */1 * *'
diff --git a/.github/workflows/wpf-ui-cd-docs.yaml b/.github/workflows/wpf-ui-cd-docs.yaml
index f6b39b482..1464f4dc6 100644
--- a/.github/workflows/wpf-ui-cd-docs.yaml
+++ b/.github/workflows/wpf-ui-cd-docs.yaml
@@ -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
diff --git a/.github/workflows/wpf-ui-cd-extension.yaml b/.github/workflows/wpf-ui-cd-extension.yaml
index 6bd56b3c9..2635972b5 100644
--- a/.github/workflows/wpf-ui-cd-extension.yaml
+++ b/.github/workflows/wpf-ui-cd-extension.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
     paths:
-      - 'src/Wpf.Ui.Extension**`
+      - 'src/Wpf.Ui.Extension**'
 
   workflow_dispatch:
 
diff --git a/.github/workflows/wpf-ui-cd-nuget.yaml b/.github/workflows/wpf-ui-cd-nuget.yaml
index a49cb274e..f47d13215 100644
--- a/.github/workflows/wpf-ui-cd-nuget.yaml
+++ b/.github/workflows/wpf-ui-cd-nuget.yaml
@@ -3,6 +3,8 @@ name: wpf-ui-cd-nuget
 on:
   push:
     branches: [main]
+    paths:
+      - 'src/**'
 
   workflow_dispatch:
 
@@ -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: |
diff --git a/.github/workflows/wpf-ui-pr-validator.yaml b/.github/workflows/wpf-ui-pr-validator.yaml
index c2e4fa698..7a641dcac 100644
--- a/.github/workflows/wpf-ui-pr-validator.yaml
+++ b/.github/workflows/wpf-ui-pr-validator.yaml
@@ -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
diff --git a/Directory.Build.props b/Directory.Build.props
index f3160f4fa..cf67c770c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -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>
 
@@ -41,7 +41,7 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>13.0</LangVersion>
     <Nullable>enable</Nullable>
 
     <!--
diff --git a/src/Wpf.Ui.Abstractions/Wpf.Ui.Abstractions.csproj b/src/Wpf.Ui.Abstractions/Wpf.Ui.Abstractions.csproj
index 23968e634..332b5d0ac 100644
--- a/src/Wpf.Ui.Abstractions/Wpf.Ui.Abstractions.csproj
+++ b/src/Wpf.Ui.Abstractions/Wpf.Ui.Abstractions.csproj
@@ -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>
diff --git a/src/Wpf.Ui.DependencyInjection/Wpf.Ui.DependencyInjection.csproj b/src/Wpf.Ui.DependencyInjection/Wpf.Ui.DependencyInjection.csproj
index 0ce875cc9..421efb133 100644
--- a/src/Wpf.Ui.DependencyInjection/Wpf.Ui.DependencyInjection.csproj
+++ b/src/Wpf.Ui.DependencyInjection/Wpf.Ui.DependencyInjection.csproj
@@ -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>
@@ -24,4 +24,4 @@
     <ProjectReference Include="..\Wpf.Ui.Abstractions\Wpf.Ui.Abstractions.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj b/src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj
index c9595d6dc..4b231cae5 100644
--- a/src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj
+++ b/src/Wpf.Ui.FontMapper/Wpf.Ui.FontMapper.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj b/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
index 057dbd043..68ecff1ff 100644
--- a/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
+++ b/src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj
@@ -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>
diff --git a/src/Wpf.Ui.SyntaxHighlight/Wpf.Ui.SyntaxHighlight.csproj b/src/Wpf.Ui.SyntaxHighlight/Wpf.Ui.SyntaxHighlight.csproj
index 34d37ceca..0b7080a5f 100644
--- a/src/Wpf.Ui.SyntaxHighlight/Wpf.Ui.SyntaxHighlight.csproj
+++ b/src/Wpf.Ui.SyntaxHighlight/Wpf.Ui.SyntaxHighlight.csproj
@@ -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>
diff --git a/src/Wpf.Ui.ToastNotifications/Wpf.Ui.ToastNotifications.csproj b/src/Wpf.Ui.ToastNotifications/Wpf.Ui.ToastNotifications.csproj
index 5b060fec9..0d5648e1b 100644
--- a/src/Wpf.Ui.ToastNotifications/Wpf.Ui.ToastNotifications.csproj
+++ b/src/Wpf.Ui.ToastNotifications/Wpf.Ui.ToastNotifications.csproj
@@ -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>
diff --git a/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj b/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj
index 5a07bb940..b06f1e6d5 100644
--- a/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj
+++ b/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj
@@ -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>
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index 5e7b139d2..ad0903130 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -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>
diff --git a/tests/Wpf.Ui.Gallery.UnitTests/Wpf.Ui.Gallery.UnitTests.csproj b/tests/Wpf.Ui.Gallery.UnitTests/Wpf.Ui.Gallery.UnitTests.csproj
index 91abfb142..d0047db9f 100644
--- a/tests/Wpf.Ui.Gallery.UnitTests/Wpf.Ui.Gallery.UnitTests.csproj
+++ b/tests/Wpf.Ui.Gallery.UnitTests/Wpf.Ui.Gallery.UnitTests.csproj
@@ -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>
 
diff --git a/tests/Wpf.Ui.UnitTests/Wpf.Ui.UnitTests.csproj b/tests/Wpf.Ui.UnitTests/Wpf.Ui.UnitTests.csproj
index 26408624f..c2e06abd5 100644
--- a/tests/Wpf.Ui.UnitTests/Wpf.Ui.UnitTests.csproj
+++ b/tests/Wpf.Ui.UnitTests/Wpf.Ui.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>