diff --git a/.github/workflows/codebreaker-lib-viewmodels.yml b/.github/workflows/codebreaker-lib-viewmodels.yml
index 239cd4de..538bdc21 100644
--- a/.github/workflows/codebreaker-lib-viewmodels.yml
+++ b/.github/workflows/codebreaker-lib-viewmodels.yml
@@ -27,7 +27,7 @@ jobs:
       version-offset: 10
       solutionfile-path: src/CodeBreaker.ViewModels.sln
       projectfile-path: src/Codebreaker.ViewModels/Codebreaker.ViewModels.csproj
-      dotnet-version: '8.0.x'
+      dotnet-version: '9.0.x'
       artifact-name: codebreaker-viewmodels
       branch-name: main
 
diff --git a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Android/CodeBreaker.Avalonia.Android.csproj b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Android/CodeBreaker.Avalonia.Android.csproj
index f804d858..e9ba3e50 100644
--- a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Android/CodeBreaker.Avalonia.Android.csproj
+++ b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Android/CodeBreaker.Avalonia.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net9.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>com.CompanyName.CodeBreaker.Avalonia</ApplicationId>
diff --git a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Browser/CodeBreaker.Avalonia.Browser.csproj b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Browser/CodeBreaker.Avalonia.Browser.csproj
index f5c5bc4b..d9ce0447 100644
--- a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Browser/CodeBreaker.Avalonia.Browser.csproj
+++ b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Browser/CodeBreaker.Avalonia.Browser.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
     <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
     <OutputType>Exe</OutputType>
diff --git a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Desktop/CodeBreaker.Avalonia.Desktop.csproj b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Desktop/CodeBreaker.Avalonia.Desktop.csproj
index 1d3e05d7..853b3b81 100644
--- a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Desktop/CodeBreaker.Avalonia.Desktop.csproj
+++ b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.Desktop/CodeBreaker.Avalonia.Desktop.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
     One for Windows with net8.0-windows TFM, one for MacOS with net8.0-macos and one with net8.0 TFM for Linux.-->
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.iOS/CodeBreaker.Avalonia.iOS.csproj b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.iOS/CodeBreaker.Avalonia.iOS.csproj
index 3b1967e3..7913bbfb 100644
--- a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.iOS/CodeBreaker.Avalonia.iOS.csproj
+++ b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia.iOS/CodeBreaker.Avalonia.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-ios</TargetFramework>
+    <TargetFramework>net9.0-ios</TargetFramework>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
     <Nullable>enable</Nullable>
diff --git a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/CodeBreaker.Avalonia.csproj b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/CodeBreaker.Avalonia.csproj
index 82d395d4..4c5fec4f 100644
--- a/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/CodeBreaker.Avalonia.csproj
+++ b/src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/CodeBreaker.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
@@ -24,15 +24,14 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia_Gif" Version="1.0.0" />
     <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="3.6.0-beta.34" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CodeBreaker.Avalonia/Directory.Build.props b/src/CodeBreaker.Avalonia/Directory.Build.props
index 3a820543..48fa85e1 100644
--- a/src/CodeBreaker.Avalonia/Directory.Build.props
+++ b/src/CodeBreaker.Avalonia/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.10</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Codebreaker.MAUI/Codebreaker.MAUI.csproj b/src/Codebreaker.MAUI/Codebreaker.MAUI.csproj
index 87c8525e..81ddc906 100644
--- a/src/Codebreaker.MAUI/Codebreaker.MAUI.csproj
+++ b/src/Codebreaker.MAUI/Codebreaker.MAUI.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-ios;net8.0-android</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-ios;net9.0-android</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>Codebreaker.MAUI</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -49,12 +49,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-      <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.6" />
-      <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
+      <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.10" />
+      <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
 	  <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="3.6.0-beta.34" />
-	  <PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+	  <PackageReference Include="CommunityToolkit.Maui" Version="9.1.1" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Codebreaker.Uno/CodebreakerUno/CodebreakerUno.csproj b/src/Codebreaker.Uno/CodebreakerUno/CodebreakerUno.csproj
index 607170db..60d4ef5c 100644
--- a/src/Codebreaker.Uno/CodebreakerUno/CodebreakerUno.csproj
+++ b/src/Codebreaker.Uno/CodebreakerUno/CodebreakerUno.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
     <TargetFrameworks>
-      net8.0-android;
-      net8.0-ios;
-      net8.0-maccatalyst;
-      net8.0-windows10.0.19041;
-      net8.0-desktop;
-      net8.0-browserwasm;
+      net9.0-android;
+      net9.0-ios;
+      net9.0-maccatalyst;
+      net9.0-windows10.0.19041;
+      net9.0-desktop;
+      net9.0-browserwasm;
     </TargetFrameworks>
 
     <OutputType>Exe</OutputType>
diff --git a/src/Codebreaker.ViewModels.Tests/Codebreaker.ViewModels.Tests.csproj b/src/Codebreaker.ViewModels.Tests/Codebreaker.ViewModels.Tests.csproj
index 7b01af9a..7280343e 100644
--- a/src/Codebreaker.ViewModels.Tests/Codebreaker.ViewModels.Tests.csproj
+++ b/src/Codebreaker.ViewModels.Tests/Codebreaker.ViewModels.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Codebreaker.ViewModels/Codebreaker.ViewModels.csproj b/src/Codebreaker.ViewModels/Codebreaker.ViewModels.csproj
index ae04b54c..51d6db0d 100644
--- a/src/Codebreaker.ViewModels/Codebreaker.ViewModels.csproj
+++ b/src/Codebreaker.ViewModels/Codebreaker.ViewModels.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <LangVersion>12.0</LangVersion>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -25,8 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
     <PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.6.0-beta.24" />
   </ItemGroup>
 
diff --git a/src/Codebreaker.WPF/Codebreaker.WPF.csproj b/src/Codebreaker.WPF/Codebreaker.WPF.csproj
index d26ec4be..66f088a6 100644
--- a/src/Codebreaker.WPF/Codebreaker.WPF.csproj
+++ b/src/Codebreaker.WPF/Codebreaker.WPF.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
@@ -36,8 +36,8 @@
 
   <ItemGroup>
     <PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="3.6.0-beta.34" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
     <PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
   </ItemGroup>
 
diff --git a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
index 56b9ec6d..06c6c12c 100644
--- a/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
+++ b/src/Codebreaker.WinUI/Codebreaker.WinUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>CodeBreaker.WinUI</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -12,7 +12,7 @@
     <EnableMsixTooling>true</EnableMsixTooling>
     <Nullable>enable</Nullable>
     <Company>CN innovation</Company>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Label="MultilingualAppToolkit">
     <MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
@@ -53,15 +53,15 @@
     <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.66.1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="WinUIEx" Version="2.3.4" />
+    <PackageReference Include="WinUIEx" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>
     <Page Update="Styles\FontSizes.xaml">
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 45caa1fe..295be934 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -16,5 +16,9 @@
 
   <PropertyGroup>
     <VersionPrefix>4.0.0</VersionPrefix>
+    <!-- .NET 9 Modern Features -->
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 </Project>
diff --git a/src/clients/shared/CodeBreaker.Services/CodeBreaker.Services.csproj b/src/clients/shared/CodeBreaker.Services/CodeBreaker.Services.csproj
index aaf5fc1d..cfe93e15 100644
--- a/src/clients/shared/CodeBreaker.Services/CodeBreaker.Services.csproj
+++ b/src/clients/shared/CodeBreaker.Services/CodeBreaker.Services.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Configurations>Debug;Release;Mudblazor;FastUI</Configurations>
   </PropertyGroup>
 
@@ -18,11 +16,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CNInnovation.Codebreaker.Shared" Version="2.0.1-beta.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.50.0" />
-    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.26.0" />
+    <PackageReference Include="CNInnovation.Codebreaker.Shared" Version="2.0.1-beta.1.8" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.66.1" />
+    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/shared/CodeBreaker.Shared/CodeBreaker.Shared.csproj b/src/shared/CodeBreaker.Shared/CodeBreaker.Shared.csproj
index e7600c50..7bba8d68 100644
--- a/src/shared/CodeBreaker.Shared/CodeBreaker.Shared.csproj
+++ b/src/shared/CodeBreaker.Shared/CodeBreaker.Shared.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   
@@ -15,9 +13,9 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.7.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.12" />
+    <PackageReference Include="FluentValidation" Version="11.12.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>