diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 7d3caa8..96f39f3 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Add Github Packages NuGet feed
         run: >
diff --git a/BattleTrace.Tests/BattleTrace.Tests.csproj b/BattleTrace.Tests/BattleTrace.Tests.csproj
index 1a11f28..a280621 100644
--- a/BattleTrace.Tests/BattleTrace.Tests.csproj
+++ b/BattleTrace.Tests/BattleTrace.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="Respawn" Version="6.2.1" />
diff --git a/BattleTrace/BattleTrace.csproj b/BattleTrace/BattleTrace.csproj
index ed2d971..c0e5afe 100644
--- a/BattleTrace/BattleTrace.csproj
+++ b/BattleTrace/BattleTrace.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>388ccefa-03c3-4ac0-8aaa-a0d422df0784</UserSecretsId>
diff --git a/Shared b/Shared
index a20e691..e410782 160000
--- a/Shared
+++ b/Shared
@@ -1 +1 @@
-Subproject commit a20e6915cac6b224dea26e200336050d2e251a3a
+Subproject commit e410782cf53e2f7651f28887ab4a9e7f6f3e68c9