From ea7791709ce0574b45c8730f593e9c3e0b234ff6 Mon Sep 17 00:00:00 2001
From: Stu Frankish <stuart.frankish@duendesoftware.com>
Date: Wed, 24 Sep 2025 12:44:26 +0100
Subject: [PATCH] Introduce new CPM per-framework variables. Condense
 per-frameworks references into a single include referencing the new
 variables. Remove explicit TargetFrameworks from all possible projects. Added
 comment to explain where csproj files still include a TargetFramework. Added
 reference to bump transitive kubernetes package (due to vulnerability).

---
 Directory.Packages.props                      | 129 +++++++++---------
 bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj  |  19 +--
 .../UserSessionDb/UserSessionDb.csproj        |   4 +-
 .../Bff.Blazor.Client.csproj                  |   2 +-
 bff/src/Bff.Blazor/Bff.Blazor.csproj          |   2 +-
 .../Bff.EntityFramework.csproj                |   2 +-
 bff/src/Bff.Yarp/Bff.Yarp.csproj              |   2 +-
 bff/src/Bff/Bff.csproj                        |   2 +-
 .../Bff.Blazor.Client.UnitTests.csproj        |   2 +-
 .../Bff.Blazor.UnitTests.csproj               |   2 +-
 .../Bff.EntityFramework.Tests.csproj          |   2 +-
 bff/test/Bff.Tests/Bff.Tests.csproj           |   2 +-
 bff/test/Hosts.Tests/Hosts.Tests.csproj       |   2 +-
 .../aspire/AppHosts/All/All.csproj            |   1 +
 .../aspire/AppHosts/Dev/Dev.csproj            |   1 +
 .../clients/src/APIs/DPoPApi/DPoPApi.csproj   |   6 +-
 .../clients/src/APIs/MtlsApi/MtlsApi.csproj   |   1 -
 .../ResourceBasedApi/ResourceBasedApi.csproj  |   6 +-
 .../src/APIs/SimpleApi/SimpleApi.csproj       |   4 -
 .../ConsoleCibaClient.csproj                  |   1 -
 .../ConsoleClientCredentialsFlow.csproj       |   1 -
 ...entialsFlowCallingIdentityServerApi.csproj |   1 -
 .../ConsoleClientCredentialsFlowDPoP.csproj   |   1 -
 ...onsoleClientCredentialsFlowPostBody.csproj |   2 +-
 .../src/ConsoleCode/ConsoleCode.csproj        |   1 -
 .../clients/src/ConsoleCode/SystemBrowser.cs  |   3 +
 .../ConsoleExtensionGrant.csproj              |   1 -
 .../ConsoleDcrClient/ConsoleDcrClient.csproj  |   1 -
 .../ConsoleDeviceFlow.csproj                  |   4 +-
 .../ConsoleEphemeralMtlsClient.csproj         |   1 -
 .../ConsoleIntrospectionClient.csproj         |   1 -
 .../ConsoleMTLSClient.csproj                  |   3 +-
 .../ConsoleParameterizedScopeClient.csproj    |   1 -
 .../ConsolePrivateKeyJwtClient.csproj         |   5 +-
 .../ConsoleResourceIndicators.csproj          |   1 -
 .../LoopbackHttpListener.cs                   |   3 +
 .../ConsoleResourceOwnerFlow.csproj           |   1 -
 .../ConsoleResourceOwnerFlowPublic.csproj     |   1 -
 .../ConsoleResourceOwnerFlowReference.csproj  |   1 -
 ...onsoleResourceOwnerFlowRefreshToken.csproj |   1 -
 .../ConsoleResourceOwnerFlowUserInfo.csproj   |   1 -
 .../ConsoleScopesResources.csproj             |   1 -
 .../clients/src/Constants/Constants.csproj    |   5 -
 .../clients/src/JsOidc/JsOidc.csproj          |   5 -
 identity-server/clients/src/JsOidc/Program.cs |   2 +
 .../MvcAutomaticTokenManagement.csproj        |   6 +-
 .../clients/src/MvcCode/MvcCode.csproj        |   1 -
 .../clients/src/MvcDPoP/MvcDPoP.csproj        |   6 +-
 .../MvcHybridBackChannel.csproj               |   5 -
 .../clients/src/MvcJarJwt/MvcJarJwt.csproj    |   5 +-
 .../src/MvcJarUriJwt/MvcJarUriJwt.csproj      |   5 +-
 identity-server/clients/src/Web/Web.csproj    |   5 +-
 .../WindowsConsoleSystemBrowser.csproj        |   1 -
 samples.props                                 |   3 +-
 src.props                                     |   3 +
 templates.props                               |   4 +-
 test.props                                    |   1 +
 57 files changed, 119 insertions(+), 166 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2d93f701e..75d0e4bfb 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,4 +1,32 @@
 <Project>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
+    <FrameworkVersion>8.0.1</FrameworkVersion>
+    <EFCoreVersion>8.0.20</EFCoreVersion>
+    <IdentityEFCoreVersion>8.0.20</IdentityEFCoreVersion>
+    <RuntimeCompilationVersion>8.0.20</RuntimeCompilationVersion>
+    <AuthenticationCertificateVersion>8.0.16</AuthenticationCertificateVersion>
+    <IdentityModelVersion>7.1.2</IdentityModelVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0'">
+    <FrameworkVersion>9.0.3</FrameworkVersion>
+    <EFCoreVersion>9.0.9</EFCoreVersion>
+    <IdentityEFCoreVersion>9.0.3</IdentityEFCoreVersion>
+    <RuntimeCompilationVersion>9.0.3</RuntimeCompilationVersion>
+    <AuthenticationCertificateVersion>9.0.3</AuthenticationCertificateVersion>
+    <IdentityModelVersion>8.0.1</IdentityModelVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0'">
+    <FrameworkVersion>10.0.0-rc.1.25451.107</FrameworkVersion>
+    <EFCoreVersion>10.0.0-rc.1.25451.107</EFCoreVersion>
+    <IdentityEFCoreVersion>10.0.0-rc.1.25451.107</IdentityEFCoreVersion>
+    <RuntimeCompilationVersion>10.0.0-rc.1.25451.107</RuntimeCompilationVersion>
+    <AuthenticationCertificateVersion>10.0.0-rc.1.25451.107</AuthenticationCertificateVersion>
+    <IdentityModelVersion>8.0.1</IdentityModelVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.3.1" />
@@ -8,6 +36,9 @@
     <PackageVersion Include="BullsEye" Version="5.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
 
+    <!-- Added aspire transitive package to resolve package vulnerability -->
+    <PackageVersion Include="KubernetesClient" Version="17.0.14" />
+
     <PackageVersion Include="Duende.AccessTokenManagement" Version="3.2.0" Condition="'$(IsBffProject)' == 'true'" />
     <PackageVersion Include="Duende.AccessTokenManagement" Version="4.0.0" Condition="'$(IsBffProject)' != 'true'" />
     <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="3.2.0" Condition="'$(IsBffProject)' == 'true'" />
@@ -22,61 +53,29 @@
     <PackageVersion Include="Duende.Private.Licensing" Version="1.0.0" />
     <PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
     <PackageVersion Include="Meziantou.Extensions.Logging.Xunit" Version="1.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.16" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.Abstractions" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.Abstractions" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.Abstractions" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
+
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AuthenticationCertificateVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(IdentityEFCoreVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="$(RuntimeCompilationVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(FrameworkVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersion)" />
+    
     <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Condition="'$(TargetFramework)' == 'net10.0'" Version="10.0.0-rc.1.25451.107" />
+    
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EFCoreVersion)" />
+    
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0-rc.1.25451.107" />
     <!-- TODO - Upgrade hybrid cache-->
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
@@ -97,15 +96,11 @@
     <!-- TODO - Upgrade service discovery and timeprovider.testing-->
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Condition="'$(TargetFramework)' == 'net8.0'" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Condition="'$(TargetFramework)' == 'net9.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Condition="'$(TargetFramework)' == 'net10.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.IdentityModel.Logging" Condition="'$(TargetFramework)' == 'net8.0'" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.Logging" Condition="'$(TargetFramework)' == 'net9.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.IdentityModel.Logging" Condition="'$(TargetFramework)' == 'net10.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Condition="'$(TargetFramework)' == 'net8.0'" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Condition="'$(TargetFramework)' == 'net9.0'" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Condition="'$(TargetFramework)' == 'net10.0'" Version="8.0.1" />
+    
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(IdentityModelVersion)" />
+    <PackageVersion Include="Microsoft.IdentityModel.Logging" Version="$(IdentityModelVersion)" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelVersion)" />
+    
     <PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.6" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.NETCore.Jit" Version="2.0.8" />
@@ -136,9 +131,9 @@
     <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Condition="'$(TargetFramework)' == 'net8.0'" Version="7.1.2" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Condition="'$(TargetFramework)' == 'net9.0'" Version="8.0.1" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Condition="'$(TargetFramework)' == 'net10.0'" Version="8.0.1" />
+    
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="$(IdentityModelVersion)" />
+    
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.Json" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
@@ -149,4 +144,4 @@
     <PackageVersion Include="Vogen" Version="7.0.3" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj b/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
index 8f0203e6a..ad20029dc 100644
--- a/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
+++ b/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
@@ -13,30 +13,25 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
+    <PackageReference Include="KubernetesClient" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Hosts.ServiceDefaults\Hosts.ServiceDefaults.csproj"
-      IsAspireProjectResource="false" />
+    <ProjectReference Include="..\Hosts.ServiceDefaults\Hosts.ServiceDefaults.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\migrations\UserSessionDb\UserSessionDb.csproj" />
     <ProjectReference Include="..\RemoteApis\Hosts.RemoteApi.DPoP\Hosts.RemoteApi.DPoP.csproj" />
-    <ProjectReference
-      Include="..\RemoteApis\Hosts.RemoteApi.Isolated\Hosts.RemoteApi.Isolated.csproj" />
+    <ProjectReference Include="..\RemoteApis\Hosts.RemoteApi.Isolated\Hosts.RemoteApi.Isolated.csproj" />
     <ProjectReference Include="..\RemoteApis\Hosts.RemoteApi\Hosts.RemoteApi.csproj" />
     <ProjectReference Include="..\Hosts.Bff.DPoP\Hosts.Bff.DPoP.csproj" />
     <ProjectReference Include="..\Hosts.Bff.EF\Hosts.Bff.EF.csproj" />
     <ProjectReference Include="..\Hosts.Bff.InMemory\Hosts.Bff.InMemory.csproj" />
-    <ProjectReference
-      Include="..\Blazor\PerComponent\Hosts.Bff.Blazor.PerComponent.Client\Hosts.Bff.Blazor.PerComponent.Client.csproj" />
-    <ProjectReference
-      Include="..\Blazor\PerComponent\Hosts.Bff.Blazor.PerComponent\Hosts.Bff.Blazor.PerComponent.csproj" />
-    <ProjectReference
-      Include="..\Blazor\WebAssembly\Hosts.Bff.Blazor.WebAssembly.Client\Hosts.Bff.Blazor.WebAssembly.Client.csproj" />
-    <ProjectReference
-      Include="..\Blazor\WebAssembly\Hosts.Bff.Blazor.WebAssembly\Hosts.Bff.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\Blazor\PerComponent\Hosts.Bff.Blazor.PerComponent.Client\Hosts.Bff.Blazor.PerComponent.Client.csproj" />
+    <ProjectReference Include="..\Blazor\PerComponent\Hosts.Bff.Blazor.PerComponent\Hosts.Bff.Blazor.PerComponent.csproj" />
+    <ProjectReference Include="..\Blazor\WebAssembly\Hosts.Bff.Blazor.WebAssembly.Client\Hosts.Bff.Blazor.WebAssembly.Client.csproj" />
+    <ProjectReference Include="..\Blazor\WebAssembly\Hosts.Bff.Blazor.WebAssembly\Hosts.Bff.Blazor.WebAssembly.csproj" />
     <ProjectReference Include="..\Hosts.IdentityServer\Hosts.IdentityServer.csproj" />
 
 
diff --git a/bff/migrations/UserSessionDb/UserSessionDb.csproj b/bff/migrations/UserSessionDb/UserSessionDb.csproj
index 6a11e9e1d..88e4842ee 100644
--- a/bff/migrations/UserSessionDb/UserSessionDb.csproj
+++ b/bff/migrations/UserSessionDb/UserSessionDb.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
diff --git a/bff/src/Bff.Blazor.Client/Bff.Blazor.Client.csproj b/bff/src/Bff.Blazor.Client/Bff.Blazor.Client.csproj
index 327d1d53c..3ccd6156f 100644
--- a/bff/src/Bff.Blazor.Client/Bff.Blazor.Client.csproj
+++ b/bff/src/Bff.Blazor.Client/Bff.Blazor.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <!--<TargetFramework>net8.0</TargetFramework>-->
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/bff/src/Bff.Blazor/Bff.Blazor.csproj b/bff/src/Bff.Blazor/Bff.Blazor.csproj
index 8b6c2b251..d3dd1449b 100644
--- a/bff/src/Bff.Blazor/Bff.Blazor.csproj
+++ b/bff/src/Bff.Blazor/Bff.Blazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <!--<TargetFramework>net8.0</TargetFramework>-->
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/bff/src/Bff.EntityFramework/Bff.EntityFramework.csproj b/bff/src/Bff.EntityFramework/Bff.EntityFramework.csproj
index b48f6e722..fafa6cb41 100644
--- a/bff/src/Bff.EntityFramework/Bff.EntityFramework.csproj
+++ b/bff/src/Bff.EntityFramework/Bff.EntityFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <!--<TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
     <Description>Entity Framework Core support for backend for frontend (BFF) host for ASP.NET Core</Description>
     <AssemblyName>Duende.BFF.EntityFramework</AssemblyName>
   </PropertyGroup>
diff --git a/bff/src/Bff.Yarp/Bff.Yarp.csproj b/bff/src/Bff.Yarp/Bff.Yarp.csproj
index f853edfb3..0ecf275d5 100644
--- a/bff/src/Bff.Yarp/Bff.Yarp.csproj
+++ b/bff/src/Bff.Yarp/Bff.Yarp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <!--<TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
     <Nullable>enable</Nullable>
     <AssemblyName>Duende.BFF.Yarp</AssemblyName>
     <Description>Backend for frontend (BFF) host for ASP.NET Core (YARP integration)</Description>
diff --git a/bff/src/Bff/Bff.csproj b/bff/src/Bff/Bff.csproj
index fadf4f67e..3c9929dc4 100644
--- a/bff/src/Bff/Bff.csproj
+++ b/bff/src/Bff/Bff.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <!--<TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
     <Nullable>enable</Nullable>
     <AssemblyName>Duende.BFF</AssemblyName>
     <Description>Backend for frontend (BFF) host for ASP.NET Core</Description>
diff --git a/bff/test/Bff.Blazor.Client.UnitTests/Bff.Blazor.Client.UnitTests.csproj b/bff/test/Bff.Blazor.Client.UnitTests/Bff.Blazor.Client.UnitTests.csproj
index 40dccf34f..ddf891a20 100644
--- a/bff/test/Bff.Blazor.Client.UnitTests/Bff.Blazor.Client.UnitTests.csproj
+++ b/bff/test/Bff.Blazor.Client.UnitTests/Bff.Blazor.Client.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <!--<TargetFramework>net8.0</TargetFramework>-->
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/bff/test/Bff.Blazor.UnitTests/Bff.Blazor.UnitTests.csproj b/bff/test/Bff.Blazor.UnitTests/Bff.Blazor.UnitTests.csproj
index a992fad04..b7b3fb07f 100644
--- a/bff/test/Bff.Blazor.UnitTests/Bff.Blazor.UnitTests.csproj
+++ b/bff/test/Bff.Blazor.UnitTests/Bff.Blazor.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <!--<TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/bff/test/Bff.EntityFramework.Tests/Bff.EntityFramework.Tests.csproj b/bff/test/Bff.EntityFramework.Tests/Bff.EntityFramework.Tests.csproj
index d26c1736b..f757167ed 100644
--- a/bff/test/Bff.EntityFramework.Tests/Bff.EntityFramework.Tests.csproj
+++ b/bff/test/Bff.EntityFramework.Tests/Bff.EntityFramework.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <!--<TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/bff/test/Bff.Tests/Bff.Tests.csproj b/bff/test/Bff.Tests/Bff.Tests.csproj
index ca59118d0..714043e9e 100644
--- a/bff/test/Bff.Tests/Bff.Tests.csproj
+++ b/bff/test/Bff.Tests/Bff.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <!--<TargetFrameworks>net8.0;net9.0</TargetFrameworks>-->
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/bff/test/Hosts.Tests/Hosts.Tests.csproj b/bff/test/Hosts.Tests/Hosts.Tests.csproj
index bf8e46ca7..d78af1fbf 100644
--- a/bff/test/Hosts.Tests/Hosts.Tests.csproj
+++ b/bff/test/Hosts.Tests/Hosts.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
diff --git a/identity-server/aspire/AppHosts/All/All.csproj b/identity-server/aspire/AppHosts/All/All.csproj
index 5a3a9b971..a233413ac 100644
--- a/identity-server/aspire/AppHosts/All/All.csproj
+++ b/identity-server/aspire/AppHosts/All/All.csproj
@@ -15,6 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
     <PackageReference Include="Aspire.Hosting.SqlServer" />
+    <PackageReference Include="KubernetesClient" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/identity-server/aspire/AppHosts/Dev/Dev.csproj b/identity-server/aspire/AppHosts/Dev/Dev.csproj
index 3184daa47..978acd4d8 100644
--- a/identity-server/aspire/AppHosts/Dev/Dev.csproj
+++ b/identity-server/aspire/AppHosts/Dev/Dev.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
+    <PackageReference Include="KubernetesClient" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
index 46b57ed28..d7277f85d 100644
--- a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
+++ b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
@@ -1,8 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
     <ProjectReference
diff --git a/identity-server/clients/src/APIs/MtlsApi/MtlsApi.csproj b/identity-server/clients/src/APIs/MtlsApi/MtlsApi.csproj
index 9940507b7..6caeedce8 100644
--- a/identity-server/clients/src/APIs/MtlsApi/MtlsApi.csproj
+++ b/identity-server/clients/src/APIs/MtlsApi/MtlsApi.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
index 6914177d0..7e78455fc 100644
--- a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
+++ b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
@@ -1,8 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
     <PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" />
diff --git a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
index 46b57ed28..98c3fcebe 100644
--- a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
+++ b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference
       Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
diff --git a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
index 428619194..a68dabbed 100644
--- a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
+++ b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
index 91fb619ec..ce893b475 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
index 9c4b63984..bb950a9f3 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
index dfa10d102..f5004a2c2 100644
--- a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
+++ b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
index 115c778cf..9bf174f00 100644
--- a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
+++ b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleCode/SystemBrowser.cs b/identity-server/clients/src/ConsoleCode/SystemBrowser.cs
index 77ee481be..e3dc90e8c 100644
--- a/identity-server/clients/src/ConsoleCode/SystemBrowser.cs
+++ b/identity-server/clients/src/ConsoleCode/SystemBrowser.cs
@@ -13,6 +13,9 @@ using Microsoft.AspNetCore.Http;
 
 namespace ConsoleResourceIndicators;
 
+#pragma warning disable ASPDEPR008 // Ignore IWebHost deprectation warnings
+#pragma warning disable ASPDEPR004 // Ignore WebHostBuilder deprectation warnings
+
 public class SystemBrowser : IBrowser
 {
     public int Port { get; }
diff --git a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
+++ b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
index bf881cf8b..d00e90d15 100644
--- a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
+++ b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
index e7159a91c..148f17eee 100644
--- a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
+++ b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
     <ProjectReference Include="..\Constants\Constants.csproj" />
   </ItemGroup>
 
diff --git a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
index 1991e823f..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
+++ b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
+++ b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
index 8243211f0..de1109eef 100644
--- a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
+++ b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <!-- Explicitly override the Directory.Build.Props as this project depends on features only available in .net 9 and higher. -->
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
index d19de5f98..eb210ef6c 100644
--- a/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
+++ b/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
index 159ec844b..1e4d9fdd9 100644
--- a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
+++ b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <!-- Explicitly override the Directory.Build.Props as this project depends on features only available in .net 9 and higher. -->
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
index 115c778cf..9bf174f00 100644
--- a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
+++ b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceIndicators/LoopbackHttpListener.cs b/identity-server/clients/src/ConsoleResourceIndicators/LoopbackHttpListener.cs
index d1b333542..e9ad02e81 100644
--- a/identity-server/clients/src/ConsoleResourceIndicators/LoopbackHttpListener.cs
+++ b/identity-server/clients/src/ConsoleResourceIndicators/LoopbackHttpListener.cs
@@ -7,6 +7,9 @@ using Microsoft.AspNetCore.Http;
 
 namespace ConsoleResourceIndicators;
 
+#pragma warning disable ASPDEPR008 // Ignore IWebHost deprectation warnings
+#pragma warning disable ASPDEPR004 // Ignore WebHostBuilder deprectation warnings
+
 public class LoopbackHttpListener : IDisposable
 {
     private const int DefaultTimeout = 60 * 5; // 5 mins (in seconds)
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
index e7159a91c..187eaedf7 100644
--- a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
+++ b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
index 8ef2ce85e..d76d24ea3 100644
--- a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
+++ b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/Constants/Constants.csproj b/identity-server/clients/src/Constants/Constants.csproj
index d7805cede..22263cf36 100644
--- a/identity-server/clients/src/Constants/Constants.csproj
+++ b/identity-server/clients/src/Constants/Constants.csproj
@@ -1,9 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Duende.IdentityModel" />
   </ItemGroup>
diff --git a/identity-server/clients/src/JsOidc/JsOidc.csproj b/identity-server/clients/src/JsOidc/JsOidc.csproj
index a375a6a27..9d51725bb 100644
--- a/identity-server/clients/src/JsOidc/JsOidc.csproj
+++ b/identity-server/clients/src/JsOidc/JsOidc.csproj
@@ -1,9 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference
       Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
diff --git a/identity-server/clients/src/JsOidc/Program.cs b/identity-server/clients/src/JsOidc/Program.cs
index df01b5ee2..c6b89fff9 100644
--- a/identity-server/clients/src/JsOidc/Program.cs
+++ b/identity-server/clients/src/JsOidc/Program.cs
@@ -5,6 +5,8 @@ using Microsoft.AspNetCore;
 
 namespace JsOidc;
 
+#pragma warning disable ASPDEPR008 // Ignore IWebHost deprectation warnings
+
 public class Program
 {
     public static void Main(string[] args) => BuildWebHost(args).Run();
diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
index 428a9e09a..db59e1957 100644
--- a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
+++ b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
diff --git a/identity-server/clients/src/MvcCode/MvcCode.csproj b/identity-server/clients/src/MvcCode/MvcCode.csproj
index 3d9ece70b..6a5bfddbb 100644
--- a/identity-server/clients/src/MvcCode/MvcCode.csproj
+++ b/identity-server/clients/src/MvcCode/MvcCode.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>fe28de52-854d-4c0f-a6b5-20f8dea1f70d</UserSecretsId>
   </PropertyGroup>
 
diff --git a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
index 603a76b7b..5732793cd 100644
--- a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
+++ b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
diff --git a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
index bc533f2cc..4c913d800 100644
--- a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
+++ b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
@@ -1,9 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
     <PackageReference Include="OpenTelemetry" />
diff --git a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
index 428a9e09a..67a947aca 100644
--- a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
+++ b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <!-- Explicitly override the Directory.Build.Props as this project depends on features only available in .net 9 and higher. -->
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
index 428a9e09a..67a947aca 100644
--- a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
+++ b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <!-- Explicitly override the Directory.Build.Props as this project depends on features only available in .net 9 and higher. -->
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/identity-server/clients/src/Web/Web.csproj b/identity-server/clients/src/Web/Web.csproj
index 3aa9c9c94..76cc73d89 100644
--- a/identity-server/clients/src/Web/Web.csproj
+++ b/identity-server/clients/src/Web/Web.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <!-- Explicitly override the Directory.Build.Props as this project depends on features only available in .net 9 and higher. -->
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/identity-server/clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj b/identity-server/clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj
index 41bfa548e..3b851ccbc 100644
--- a/identity-server/clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj
+++ b/identity-server/clients/src/WindowsConsoleSystemBrowser/WindowsConsoleSystemBrowser.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
diff --git a/samples.props b/samples.props
index f8fc1d9c4..54e9a8228 100644
--- a/samples.props
+++ b/samples.props
@@ -2,6 +2,7 @@
 <Project>
 
   <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
@@ -21,4 +22,4 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src.props b/src.props
index cf043eb36..010b4b20f 100644
--- a/src.props
+++ b/src.props
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
+
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    
     <Authors>Duende Software</Authors>
     <Company>Duende Software</Company>
     <Copyright>Duende Software</Copyright>
diff --git a/templates.props b/templates.props
index 7fb9c5072..7ac4c71db 100644
--- a/templates.props
+++ b/templates.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <language>en-US</language>
@@ -56,4 +56,4 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test.props b/test.props
index aa10cbd75..61a33ca95 100644
--- a/test.props
+++ b/test.props
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <DebugType>full</DebugType>
     <IsPackable>false</IsPackable>