Restructure projects

- Remove "Duende." prefix from project names and folders - Add <AssemblyName> and <RootNamespace> across impacted projects - Add Build project to solution. - Move all tests to a single test project
DuendeSoftware · Oct 15, 2024 · d5ba089 · d5ba089
1 parent d80fa66
commit d5ba089
Show file tree

Hide file tree

Showing 182 changed files with 169 additions and 258 deletions.
diff --git a/Duende.Bff.sln → Bff.sln b/Duende.Bff.sln → Bff.sln
diff --git a/Duende.Bff.sln.DotSettings → Bff.sln.DotSettings b/Duende.Bff.sln.DotSettings → Bff.sln.DotSettings
@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.</s:String></wpf:ResourceDictionary>
+// See LICENSE in the project root for license information.</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Duende.Bff.slnLaunch → Bff.slnLaunch b/Duende.Bff.slnLaunch → Bff.slnLaunch
diff --git a/Bff.v3.ncrunchsolution b/Bff.v3.ncrunchsolution
@@ -0,0 +1,8 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <EnableRDI>True</EnableRDI>
+    <RdiConfigured>True</RdiConfigured>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
diff --git a/build.cmd b/build.cmd
diff --git a/build.sh b/build.sh
diff --git a/build/Program.cs b/build/Program.cs
@@ -56,11 +56,11 @@ internal static async Task Main(string[] args)
 
             Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>
             {
-                Run("dotnet", $"pack ./src/Duende.Bff/Duende.Bff.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
-                Run("dotnet", $"pack ./src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
-                Run("dotnet", $"pack ./src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
-                Run("dotnet", $"pack ./src/Duende.Bff.Blazor/Duende.Bff.Blazor.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
-                Run("dotnet", $"pack ./src/Duende.Bff.Blazor.Client/Duende.Bff.Blazor.Client.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack ./src/Bff/Bff.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack ./src/Bff.EntityFramework/Bff.EntityFramework.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack ./src/Bff.Yarp/Bff.Yarp.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack ./src/Bff.Blazor/Bff.Blazor.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack ./src/Bff.Blazor.Client/Bff.Blazor.Client.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
             });
 
             Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>

diff --git a/migrations/UserSessionDb/UserSessionDb.csproj b/migrations/UserSessionDb/UserSessionDb.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.Bff.EntityFramework\Duende.Bff.EntityFramework.csproj" />
+    <ProjectReference Include="..\..\src\Bff.EntityFramework\Bff.EntityFramework.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Blazor/PerComponent/PerComponent.Client/PerComponent.Client.csproj b/samples/Blazor/PerComponent/PerComponent.Client/PerComponent.Client.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Duende.Bff.Blazor.Client\Duende.Bff.Blazor.Client.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Bff.Blazor.Client\Bff.Blazor.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Blazor/PerComponent/PerComponent/PerComponent.csproj b/samples/Blazor/PerComponent/PerComponent/PerComponent.csproj
@@ -12,9 +12,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\PerComponent.Client\PerComponent.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Duende.Bff\Duende.Bff.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Duende.Bff.Blazor\Duende.Bff.Blazor.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Bff\Bff.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Bff.Yarp\Bff.Yarp.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Bff.Blazor\Bff.Blazor.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Blazor/WebAssembly/WebAssembly.Client/WebAssembly.Client.csproj b/samples/Blazor/WebAssembly/WebAssembly.Client/WebAssembly.Client.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Duende.Bff.Blazor.Client\Duende.Bff.Blazor.Client.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Bff.Blazor.Client\Bff.Blazor.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Blazor/WebAssembly/WebAssembly/WebAssembly.csproj b/samples/Blazor/WebAssembly/WebAssembly/WebAssembly.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Duende.Bff\Duende.Bff.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Bff\Bff.csproj" />
     <ProjectReference Include="..\WebAssembly.Client\WebAssembly.Client.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />

diff --git a/samples/JS.Yarp/JS.Yarp.csproj b/samples/JS.Yarp/JS.Yarp.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
+      <ProjectReference Include="..\..\src\Bff.Yarp\Bff.Yarp.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/JS8.DPoP/JS8.DPoP.csproj b/samples/JS8.DPoP/JS8.DPoP.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
+      <ProjectReference Include="..\..\src\Bff.Yarp\Bff.Yarp.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/JS8.EF/JS8.EF.csproj b/samples/JS8.EF/JS8.EF.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.Bff.EntityFramework\Duende.Bff.EntityFramework.csproj" />
-    <ProjectReference Include="..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
+    <ProjectReference Include="..\..\src\Bff.EntityFramework\Bff.EntityFramework.csproj" />
+    <ProjectReference Include="..\..\src\Bff.Yarp\Bff.Yarp.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/JS8/JS8.csproj b/samples/JS8/JS8.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
+      <ProjectReference Include="..\..\src\Bff.Yarp\Bff.Yarp.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...e.Bff.Blazor.Client/AntiforgeryHandler.cs → src/Bff.Blazor.Client/AntiforgeryHandler.cs b/...e.Bff.Blazor.Client/AntiforgeryHandler.cs → src/Bff.Blazor.Client/AntiforgeryHandler.cs
diff --git a/...or.Client/Duende.Bff.Blazor.Client.csproj → ...ff.Blazor.Client/Bff.Blazor.Client.csproj b/...or.Client/Duende.Bff.Blazor.Client.csproj → ...ff.Blazor.Client/Bff.Blazor.Client.csproj
@@ -4,24 +4,26 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <AssemblyName>Duende.BFF.Blazor.Client</AssemblyName>
+    <RootNamespace>Duende.Bff.Blazor.Client</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Duende.Bff\Shared\ClaimLite.cs" Link="Shared\ClaimLite.cs" />
-    <Compile Include="..\Duende.Bff\Shared\ClaimsLiteExtensions.cs" Link="Shared\ClaimsLiteExtensions.cs" />
-    <Compile Include="..\Duende.Bff\Shared\ClaimsPrincipalLite.cs" Link="Shared\ClaimsPrincipalLite.cs" />
+    <Compile Include="..\Bff\Shared\ClaimLite.cs" Link="Shared\ClaimLite.cs" />
+    <Compile Include="..\Bff\Shared\ClaimsLiteExtensions.cs" Link="Shared\ClaimsLiteExtensions.cs" />
+    <Compile Include="..\Bff\Shared\ClaimsPrincipalLite.cs" Link="Shared\ClaimsPrincipalLite.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" />
     <PackageReference Include="Microsoft.Extensions.Http" />
     <!-- Explicitly taking this version so that we don't pull in vulnerable old versions. -->
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="Duende.Bff.Blazor.Client.UnitTests" />
+    <InternalsVisibleTo Include="Bff.Tests" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
   </ItemGroup>
 

diff --git a/...nde.Bff.Blazor.Client/BffBlazorOptions.cs → src/Bff.Blazor.Client/BffBlazorOptions.cs b/...nde.Bff.Blazor.Client/BffBlazorOptions.cs → src/Bff.Blazor.Client/BffBlazorOptions.cs
diff --git a/...t/BffClientAuthenticationStateProvider.cs → ...t/BffClientAuthenticationStateProvider.cs b/...t/BffClientAuthenticationStateProvider.cs → ...t/BffClientAuthenticationStateProvider.cs
diff --git a/...Blazor.Client/Internals/GetUserService.cs → ...Blazor.Client/Internals/GetUserService.cs b/...Blazor.Client/Internals/GetUserService.cs → ...Blazor.Client/Internals/GetUserService.cs
diff --git a/...lazor.Client/Internals/IGetUserService.cs → ...lazor.Client/Internals/IGetUserService.cs b/...lazor.Client/Internals/IGetUserService.cs → ...lazor.Client/Internals/IGetUserService.cs
diff --git a/...lient/Internals/IPersistentUserService.cs → ...lient/Internals/IPersistentUserService.cs b/...lient/Internals/IPersistentUserService.cs → ...lient/Internals/IPersistentUserService.cs
diff --git a/...Client/Internals/PersistentUserService.cs → ...Client/Internals/PersistentUserService.cs b/...Client/Internals/PersistentUserService.cs → ...Client/Internals/PersistentUserService.cs
diff --git a/...zor.Client/ServiceCollectionExtensions.cs → ...zor.Client/ServiceCollectionExtensions.cs b/...zor.Client/ServiceCollectionExtensions.cs → ...zor.Client/ServiceCollectionExtensions.cs
diff --git a/...uende.Bff.Blazor/Duende.Bff.Blazor.csproj → src/Bff.Blazor/Bff.Blazor.csproj b/...uende.Bff.Blazor/Duende.Bff.Blazor.csproj → src/Bff.Blazor/Bff.Blazor.csproj
@@ -4,11 +4,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <AssemblyName>Duende.BFF.Blazor</AssemblyName>
+    <RootNamespace>Duende.Bff.Blazor</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Duende.Bff\Duende.Bff.csproj" />
-    <ProjectReference Include="..\Duende.Bff.Blazor.Client\Duende.Bff.Blazor.Client.csproj" />
+    <ProjectReference Include="..\Bff\Bff.csproj" />
+    <ProjectReference Include="..\Bff.Blazor.Client\Bff.Blazor.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...Duende.Bff.Blazor/BffBuilderExtensions.cs → src/Bff.Blazor/BffBuilderExtensions.cs b/...Duende.Bff.Blazor/BffBuilderExtensions.cs → src/Bff.Blazor/BffBuilderExtensions.cs
diff --git a/...r/BffServerAuthenticationStateProvider.cs → ...r/BffServerAuthenticationStateProvider.cs b/...r/BffServerAuthenticationStateProvider.cs → ...r/BffServerAuthenticationStateProvider.cs
diff --git a/...or/CaptureManagementClaimsCookieEvents.cs → ...or/CaptureManagementClaimsCookieEvents.cs b/...or/CaptureManagementClaimsCookieEvents.cs → ...or/CaptureManagementClaimsCookieEvents.cs
diff --git a/...Duende.Bff.Blazor/ServerSideTokenStore.cs → src/Bff.Blazor/ServerSideTokenStore.cs b/...Duende.Bff.Blazor/ServerSideTokenStore.cs → src/Bff.Blazor/ServerSideTokenStore.cs
diff --git a/...amework/Duende.Bff.EntityFramework.csproj → ...ntityFramework/Bff.EntityFramework.csproj b/...amework/Duende.Bff.EntityFramework.csproj → ...ntityFramework/Bff.EntityFramework.csproj
@@ -4,14 +4,14 @@
     <TargetFrameworks>net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <LangVersion>latest</LangVersion>
-
     <AssemblyName>Duende.BFF.EntityFramework</AssemblyName>
+    <RootNamespace>Duende.Bff.EntityFramework</RootNamespace>
     <Description>Entity Framework Core support for backend for frontend (BFF) host for ASP.NET Core</Description>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
 
-    <ProjectReference Include="..\Duende.Bff\Duende.Bff.csproj" />
+    <ProjectReference Include="..\Bff\Bff.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ork/Configuration/BffBuilderExtensions.cs → ...ork/Configuration/BffBuilderExtensions.cs b/...ork/Configuration/BffBuilderExtensions.cs → ...ork/Configuration/BffBuilderExtensions.cs
diff --git a/...work/Configuration/SessionStoreOptions.cs → ...work/Configuration/SessionStoreOptions.cs b/...work/Configuration/SessionStoreOptions.cs → ...work/Configuration/SessionStoreOptions.cs
diff --git a/...ework/Configuration/TableConfiguration.cs → ...ework/Configuration/TableConfiguration.cs b/...ework/Configuration/TableConfiguration.cs → ...ework/Configuration/TableConfiguration.cs
diff --git a/...tyFramework/Database/ISessionDbContext.cs → ...tyFramework/Database/ISessionDbContext.cs b/...tyFramework/Database/ISessionDbContext.cs → ...tyFramework/Database/ISessionDbContext.cs
diff --git a/...mework/Database/ModelBuilderExtensions.cs → ...mework/Database/ModelBuilderExtensions.cs b/...mework/Database/ModelBuilderExtensions.cs → ...mework/Database/ModelBuilderExtensions.cs
diff --git a/...ityFramework/Database/SessionDbContext.cs → ...ityFramework/Database/SessionDbContext.cs b/...ityFramework/Database/SessionDbContext.cs → ...ityFramework/Database/SessionDbContext.cs
diff --git a/...tyFramework/Database/UserSessionEntity.cs → ...tyFramework/Database/UserSessionEntity.cs b/...tyFramework/Database/UserSessionEntity.cs → ...tyFramework/Database/UserSessionEntity.cs
diff --git a/...EntityFramework/Store/UserSessionStore.cs → ...EntityFramework/Store/UserSessionStore.cs b/...EntityFramework/Store/UserSessionStore.cs → ...EntityFramework/Store/UserSessionStore.cs
diff --git a/...e.Bff.Yarp/AccessTokenRequestTransform.cs → src/Bff.Yarp/AccessTokenRequestTransform.cs b/...e.Bff.Yarp/AccessTokenRequestTransform.cs → src/Bff.Yarp/AccessTokenRequestTransform.cs
diff --git a/....Bff.Yarp/AccessTokenTransformProvider.cs → src/Bff.Yarp/AccessTokenTransformProvider.cs b/....Bff.Yarp/AccessTokenTransformProvider.cs → src/Bff.Yarp/AccessTokenTransformProvider.cs
diff --git a/...de.Bff.Yarp/ActivityPropagationHandler.cs → src/Bff.Yarp/ActivityPropagationHandler.cs b/...de.Bff.Yarp/ActivityPropagationHandler.cs → src/Bff.Yarp/ActivityPropagationHandler.cs
diff --git a/src/Duende.Bff.Yarp/AntiforgeryMiddleware.cs → src/Bff.Yarp/AntiforgeryMiddleware.cs b/src/Duende.Bff.Yarp/AntiforgeryMiddleware.cs → src/Bff.Yarp/AntiforgeryMiddleware.cs
diff --git a/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj → src/Bff.Yarp/Bff.Yarp.csproj b/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj → src/Bff.Yarp/Bff.Yarp.csproj
@@ -5,8 +5,8 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
-
         <AssemblyName>Duende.BFF.Yarp</AssemblyName>
+        <RootNamespace>Duende.Bff.Yarp</RootNamespace>
         <Description>Backend for frontend (BFF) host for ASP.NET Core (YARP integration)</Description>
     </PropertyGroup>
 
@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Duende.Bff\Duende.Bff.csproj" />
+        <ProjectReference Include="..\Bff\Bff.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Duende.Bff.Yarp/BffBuilderExtensions.cs → src/Bff.Yarp/BffBuilderExtensions.cs b/src/Duende.Bff.Yarp/BffBuilderExtensions.cs → src/Bff.Yarp/BffBuilderExtensions.cs
diff --git a/.../BffYarpEndpointRouteBuilderExtensions.cs → .../BffYarpEndpointRouteBuilderExtensions.cs b/.../BffYarpEndpointRouteBuilderExtensions.cs → .../BffYarpEndpointRouteBuilderExtensions.cs
diff --git a/....Yarp/DefaultHttpMessageInvokerFactory.cs → ....Yarp/DefaultHttpMessageInvokerFactory.cs b/....Yarp/DefaultHttpMessageInvokerFactory.cs → ....Yarp/DefaultHttpMessageInvokerFactory.cs
diff --git a/...Bff.Yarp/DefaultHttpTransformerFactory.cs → ...Bff.Yarp/DefaultHttpTransformerFactory.cs b/...Bff.Yarp/DefaultHttpTransformerFactory.cs → ...Bff.Yarp/DefaultHttpTransformerFactory.cs
diff --git a/...de.Bff.Yarp/IHttpMessageInvokerFactory.cs → src/Bff.Yarp/IHttpMessageInvokerFactory.cs b/...de.Bff.Yarp/IHttpMessageInvokerFactory.cs → src/Bff.Yarp/IHttpMessageInvokerFactory.cs
diff --git a/...uende.Bff.Yarp/IHttpTransformerFactory.cs → src/Bff.Yarp/IHttpTransformerFactory.cs b/...uende.Bff.Yarp/IHttpTransformerFactory.cs → src/Bff.Yarp/IHttpTransformerFactory.cs
diff --git a/src/Duende.Bff.Yarp/Log.cs → src/Bff.Yarp/Log.cs b/src/Duende.Bff.Yarp/Log.cs → src/Bff.Yarp/Log.cs
diff --git a/...nde.Bff.Yarp/ProxyAppBuilderExtensions.cs → src/Bff.Yarp/ProxyAppBuilderExtensions.cs b/...nde.Bff.Yarp/ProxyAppBuilderExtensions.cs → src/Bff.Yarp/ProxyAppBuilderExtensions.cs
diff --git a/src/Duende.Bff.Yarp/ProxyConfigExtensions.cs → src/Bff.Yarp/ProxyConfigExtensions.cs b/src/Duende.Bff.Yarp/ProxyConfigExtensions.cs → src/Bff.Yarp/ProxyConfigExtensions.cs
diff --git a/src/Duende.Bff.Yarp/RemoteApiEndpoint.cs → src/Bff.Yarp/RemoteApiEndpoint.cs b/src/Duende.Bff.Yarp/RemoteApiEndpoint.cs → src/Bff.Yarp/RemoteApiEndpoint.cs
diff --git a/...Bff.Yarp/ReverseProxyBuilderExtensions.cs → ...Bff.Yarp/ReverseProxyBuilderExtensions.cs b/...Bff.Yarp/ReverseProxyBuilderExtensions.cs → ...Bff.Yarp/ReverseProxyBuilderExtensions.cs
diff --git a/...oxyEndpointConventionBuilderExtensions.cs → ...oxyEndpointConventionBuilderExtensions.cs b/...oxyEndpointConventionBuilderExtensions.cs → ...oxyEndpointConventionBuilderExtensions.cs
diff --git a/src/Duende.Bff/Attributes.cs → src/Bff/Attributes.cs b/src/Duende.Bff/Attributes.cs → src/Bff/Attributes.cs
diff --git a/src/Duende.Bff/Duende.Bff.csproj → src/Bff/Bff.csproj b/src/Duende.Bff/Duende.Bff.csproj → src/Bff/Bff.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>net8.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
-
         <AssemblyName>Duende.BFF</AssemblyName>
+        <RootNamespace>Duende.Bff</RootNamespace>
         <Description>Backend for frontend (BFF) host for ASP.NET Core</Description>
     </PropertyGroup>
 
@@ -16,6 +16,6 @@
     </ItemGroup>
 
     <ItemGroup>
-       <InternalsVisibleTo Include="Duende.Bff.Blazor" />
+       <InternalsVisibleTo Include="Duende.BFF.Blazor" />
     </ItemGroup>
 </Project>
diff --git a/...ration/BffApplicationBuilderExtensions.cs → ...ration/BffApplicationBuilderExtensions.cs b/...ration/BffApplicationBuilderExtensions.cs → ...ration/BffApplicationBuilderExtensions.cs
diff --git a/src/Duende.Bff/Configuration/BffBuilder.cs → src/Bff/Configuration/BffBuilder.cs b/src/Duende.Bff/Configuration/BffBuilder.cs → src/Bff/Configuration/BffBuilder.cs
diff --git a/...tion/BffEndpointRouteBuilderExtensions.cs → ...tion/BffEndpointRouteBuilderExtensions.cs b/...tion/BffEndpointRouteBuilderExtensions.cs → ...tion/BffEndpointRouteBuilderExtensions.cs
diff --git a/src/Duende.Bff/Configuration/BffOptions.cs → src/Bff/Configuration/BffOptions.cs b/src/Duende.Bff/Configuration/BffOptions.cs → src/Bff/Configuration/BffOptions.cs
diff --git a/...uration/BffRemoteApiEndpointExtensions.cs → ...uration/BffRemoteApiEndpointExtensions.cs b/...uration/BffRemoteApiEndpointExtensions.cs → ...uration/BffRemoteApiEndpointExtensions.cs
diff --git a/...iguration/BffRemoteApiEndpointMetadata.cs → ...iguration/BffRemoteApiEndpointMetadata.cs b/...iguration/BffRemoteApiEndpointMetadata.cs → ...iguration/BffRemoteApiEndpointMetadata.cs
diff --git a/...uration/BffServiceCollectionExtensions.cs → ...uration/BffServiceCollectionExtensions.cs b/...uration/BffServiceCollectionExtensions.cs → ...uration/BffServiceCollectionExtensions.cs
diff --git a/src/Duende.Bff/Configuration/Decorator.cs → src/Bff/Configuration/Decorator.cs b/src/Duende.Bff/Configuration/Decorator.cs → src/Bff/Configuration/Decorator.cs
diff --git a/...on/EndpointConventionBuilderExtensions.cs → ...on/EndpointConventionBuilderExtensions.cs b/...on/EndpointConventionBuilderExtensions.cs → ...on/EndpointConventionBuilderExtensions.cs
diff --git a/...Bff/ConfigureUserTokenManagmentOptions.cs → ...Bff/ConfigureUserTokenManagmentOptions.cs b/...Bff/ConfigureUserTokenManagmentOptions.cs → ...Bff/ConfigureUserTokenManagmentOptions.cs
diff --git a/src/Duende.Bff/Constants.cs → src/Bff/Constants.cs b/src/Duende.Bff/Constants.cs → src/Bff/Constants.cs
diff --git a/...Bff/EndpointProcessing/BffApiAttribute.cs → ...Bff/EndpointProcessing/BffApiAttribute.cs b/...Bff/EndpointProcessing/BffApiAttribute.cs → ...Bff/EndpointProcessing/BffApiAttribute.cs
diff --git a/...cessing/BffApiSkipAntiforgeryAttribute.cs → ...cessing/BffApiSkipAntiforgeryAttribute.cs b/...cessing/BffApiSkipAntiforgeryAttribute.cs → ...cessing/BffApiSkipAntiforgeryAttribute.cs
diff --git a/...ng/BffApiSkipResponseHandlingAttribute.cs → ...ng/BffApiSkipResponseHandlingAttribute.cs b/...ng/BffApiSkipResponseHandlingAttribute.cs → ...ng/BffApiSkipResponseHandlingAttribute.cs
diff --git a/...intProcessing/BffAuthenticationService.cs → ...intProcessing/BffAuthenticationService.cs b/...intProcessing/BffAuthenticationService.cs → ...intProcessing/BffAuthenticationService.cs
diff --git a/...e.Bff/EndpointProcessing/BffMiddleware.cs → src/Bff/EndpointProcessing/BffMiddleware.cs b/...e.Bff/EndpointProcessing/BffMiddleware.cs → src/Bff/EndpointProcessing/BffMiddleware.cs
diff --git a/...pointProcessing/BffUIEndpointAttribute.cs → ...pointProcessing/BffUIEndpointAttribute.cs b/...pointProcessing/BffUIEndpointAttribute.cs → ...pointProcessing/BffUIEndpointAttribute.cs
diff --git a/...rocessing/BffUserAccessTokenParameters.cs → ...rocessing/BffUserAccessTokenParameters.cs b/...rocessing/BffUserAccessTokenParameters.cs → ...rocessing/BffUserAccessTokenParameters.cs
diff --git a/...Bff/EndpointProcessing/IBffApiEndpoint.cs → ...Bff/EndpointProcessing/IBffApiEndpoint.cs b/...Bff/EndpointProcessing/IBffApiEndpoint.cs → ...Bff/EndpointProcessing/IBffApiEndpoint.cs
diff --git a/...pointProcessing/IBffApiSkipAntiforgery.cs → ...pointProcessing/IBffApiSkipAntiforgery.cs b/...pointProcessing/IBffApiSkipAntiforgery.cs → ...pointProcessing/IBffApiSkipAntiforgery.cs
diff --git a/...Processing/IBffApiSkipResponseHandling.cs → ...Processing/IBffApiSkipResponseHandling.cs b/...Processing/IBffApiSkipResponseHandling.cs → ...Processing/IBffApiSkipResponseHandling.cs
diff --git a/...Logout/DefaultBackchannelLogoutService.cs → ...Logout/DefaultBackchannelLogoutService.cs b/...Logout/DefaultBackchannelLogoutService.cs → ...Logout/DefaultBackchannelLogoutService.cs
diff --git a/...hannelLogout/IBackchannelLogoutService.cs → ...hannelLogout/IBackchannelLogoutService.cs b/...hannelLogout/IBackchannelLogoutService.cs → ...hannelLogout/IBackchannelLogoutService.cs
diff --git a/.../Diagnostics/DefaultDiagnosticsService.cs → .../Diagnostics/DefaultDiagnosticsService.cs b/.../Diagnostics/DefaultDiagnosticsService.cs → .../Diagnostics/DefaultDiagnosticsService.cs
diff --git a/...rvices/Diagnostics/IDiagnosticsService.cs → ...rvices/Diagnostics/IDiagnosticsService.cs b/...rvices/Diagnostics/IDiagnosticsService.cs → ...rvices/Diagnostics/IDiagnosticsService.cs
diff --git a/...f/EndpointServices/IBffEndpointService.cs → ...f/EndpointServices/IBffEndpointService.cs b/...f/EndpointServices/IBffEndpointService.cs → ...f/EndpointServices/IBffEndpointService.cs
diff --git a/...ointServices/Login/DefaultLoginService.cs → ...ointServices/Login/DefaultLoginService.cs b/...ointServices/Login/DefaultLoginService.cs → ...ointServices/Login/DefaultLoginService.cs
diff --git a/...f/EndpointServices/Login/ILoginService.cs → ...f/EndpointServices/Login/ILoginService.cs b/...f/EndpointServices/Login/ILoginService.cs → ...f/EndpointServices/Login/ILoginService.cs
diff --git a/...ntServices/Logout/DefaultLogoutService.cs → ...ntServices/Logout/DefaultLogoutService.cs b/...ntServices/Logout/DefaultLogoutService.cs → ...ntServices/Logout/DefaultLogoutService.cs
diff --git a/...EndpointServices/Logout/ILogoutService.cs → ...EndpointServices/Logout/ILogoutService.cs b/...EndpointServices/Logout/ILogoutService.cs → ...EndpointServices/Logout/ILogoutService.cs
diff --git a/...ces/SilentLogin/BffOpenIdConnectEvents.cs → ...ces/SilentLogin/BffOpenIdConnectEvents.cs b/...ces/SilentLogin/BffOpenIdConnectEvents.cs → ...ces/SilentLogin/BffOpenIdConnectEvents.cs
diff --git a/...ogin/DefaultSilentLoginCallbackService.cs → ...ogin/DefaultSilentLoginCallbackService.cs b/...ogin/DefaultSilentLoginCallbackService.cs → ...ogin/DefaultSilentLoginCallbackService.cs
diff --git a/.../SilentLogin/DefaultSilentLoginService.cs → .../SilentLogin/DefaultSilentLoginService.cs b/.../SilentLogin/DefaultSilentLoginService.cs → .../SilentLogin/DefaultSilentLoginService.cs
diff --git a/...ilentLogin/ISilentLoginCallbackService.cs → ...ilentLogin/ISilentLoginCallbackService.cs b/...ilentLogin/ISilentLoginCallbackService.cs → ...ilentLogin/ISilentLoginCallbackService.cs
diff --git a/...rvices/SilentLogin/ISilentLoginService.cs → ...rvices/SilentLogin/ISilentLoginService.cs b/...rvices/SilentLogin/ISilentLoginService.cs → ...rvices/SilentLogin/ISilentLoginService.cs
diff --git a/...PostConfigureOidcOptionsForSilentLogin.cs → ...PostConfigureOidcOptionsForSilentLogin.cs b/...PostConfigureOidcOptionsForSilentLogin.cs → ...PostConfigureOidcOptionsForSilentLogin.cs
diff --git a/...ointServices/User/DefaultClaimsService.cs → ...ointServices/User/DefaultClaimsService.cs b/...ointServices/User/DefaultClaimsService.cs → ...ointServices/User/DefaultClaimsService.cs
diff --git a/...dpointServices/User/DefaultUserService.cs → ...dpointServices/User/DefaultUserService.cs b/...dpointServices/User/DefaultUserService.cs → ...dpointServices/User/DefaultUserService.cs
diff --git a/...f/EndpointServices/User/IClaimsService.cs → ...f/EndpointServices/User/IClaimsService.cs b/...f/EndpointServices/User/IClaimsService.cs → ...f/EndpointServices/User/IClaimsService.cs
diff --git a/...Bff/EndpointServices/User/IUserService.cs → ...Bff/EndpointServices/User/IUserService.cs b/...Bff/EndpointServices/User/IUserService.cs → ...Bff/EndpointServices/User/IUserService.cs
diff --git a/...ons/AuthenticationPropertiesExtensions.cs → ...ons/AuthenticationPropertiesExtensions.cs b/...ons/AuthenticationPropertiesExtensions.cs → ...ons/AuthenticationPropertiesExtensions.cs
diff --git a/...ensions/AuthenticationTicketExtensions.cs → ...ensions/AuthenticationTicketExtensions.cs b/...ensions/AuthenticationTicketExtensions.cs → ...ensions/AuthenticationTicketExtensions.cs
diff --git a/...e.Bff/Extensions/HttpContextExtensions.cs → src/Bff/Extensions/HttpContextExtensions.cs b/...e.Bff/Extensions/HttpContextExtensions.cs → src/Bff/Extensions/HttpContextExtensions.cs
diff --git a/src/Duende.Bff/General/AccessTokenResult.cs → src/Bff/General/AccessTokenResult.cs b/src/Duende.Bff/General/AccessTokenResult.cs → src/Bff/General/AccessTokenResult.cs
diff --git a/...ff/General/AccessTokenRetreivalContext.cs → ...ff/General/AccessTokenRetreivalContext.cs b/...ff/General/AccessTokenRetreivalContext.cs → ...ff/General/AccessTokenRetreivalContext.cs
diff --git a/....Bff/General/AccessTokenRetrievalError.cs → src/Bff/General/AccessTokenRetrievalError.cs b/....Bff/General/AccessTokenRetrievalError.cs → src/Bff/General/AccessTokenRetrievalError.cs
diff --git a/src/Duende.Bff/General/BearerTokenResult.cs → src/Bff/General/BearerTokenResult.cs b/src/Duende.Bff/General/BearerTokenResult.cs → src/Bff/General/BearerTokenResult.cs
diff --git a/src/Duende.Bff/General/DPoPTokenResult.cs → src/Bff/General/DPoPTokenResult.cs b/src/Duende.Bff/General/DPoPTokenResult.cs → src/Bff/General/DPoPTokenResult.cs
diff --git a/...ff/General/DefaultAccessTokenRetriever.cs → ...ff/General/DefaultAccessTokenRetriever.cs b/...ff/General/DefaultAccessTokenRetriever.cs → ...ff/General/DefaultAccessTokenRetriever.cs
diff --git a/...ende.Bff/General/IAccessTokenRetriever.cs → src/Bff/General/IAccessTokenRetriever.cs b/...ende.Bff/General/IAccessTokenRetriever.cs → src/Bff/General/IAccessTokenRetriever.cs
diff --git a/...Duende.Bff/General/IReturnUrlValidator.cs → src/Bff/General/IReturnUrlValidator.cs b/...Duende.Bff/General/IReturnUrlValidator.cs → src/Bff/General/IReturnUrlValidator.cs
diff --git a/...Bff/General/LocalUrlReturnUrlValidator.cs → ...Bff/General/LocalUrlReturnUrlValidator.cs b/...Bff/General/LocalUrlReturnUrlValidator.cs → ...Bff/General/LocalUrlReturnUrlValidator.cs
diff --git a/src/Duende.Bff/General/Log.cs → src/Bff/General/Log.cs b/src/Duende.Bff/General/Log.cs → src/Bff/General/Log.cs
diff --git a/...Duende.Bff/General/NoAccessTokenResult.cs → src/Bff/General/NoAccessTokenResult.cs b/...Duende.Bff/General/NoAccessTokenResult.cs → src/Bff/General/NoAccessTokenResult.cs
diff --git a/src/Duende.Bff/General/TokenType.cs → src/Bff/General/TokenType.cs b/src/Duende.Bff/General/TokenType.cs → src/Bff/General/TokenType.cs
diff --git a/src/Duende.Bff/IsExternalInit.cs → src/Bff/IsExternalInit.cs b/src/Duende.Bff/IsExternalInit.cs → src/Bff/IsExternalInit.cs
diff --git a/src/Duende.Bff/Licensing/License.cs → src/Bff/Licensing/License.cs b/src/Duende.Bff/Licensing/License.cs → src/Bff/Licensing/License.cs
diff --git a/src/Duende.Bff/Licensing/LicenseValidator.cs → src/Bff/Licensing/LicenseValidator.cs b/src/Duende.Bff/Licensing/LicenseValidator.cs → src/Bff/Licensing/LicenseValidator.cs
diff --git a/...de.Bff/Licensing/LicenseValidatorLocal.cs → src/Bff/Licensing/LicenseValidatorLocal.cs b/...de.Bff/Licensing/LicenseValidatorLocal.cs → src/Bff/Licensing/LicenseValidatorLocal.cs
diff --git a/...ureApplicationCookieRevokeRefreshToken.cs → ...ureApplicationCookieRevokeRefreshToken.cs b/...ureApplicationCookieRevokeRefreshToken.cs → ...ureApplicationCookieRevokeRefreshToken.cs
diff --git a/...tConfigureApplicationCookieTicketStore.cs → ...tConfigureApplicationCookieTicketStore.cs b/...tConfigureApplicationCookieTicketStore.cs → ...tConfigureApplicationCookieTicketStore.cs
diff --git a/...tConfigureApplicationValidatePrincipal.cs → ...tConfigureApplicationValidatePrincipal.cs b/...tConfigureApplicationValidatePrincipal.cs → ...tConfigureApplicationValidatePrincipal.cs
diff --git a/...on/PostConfigureSlidingExpirationCheck.cs → ...on/PostConfigureSlidingExpirationCheck.cs b/...on/PostConfigureSlidingExpirationCheck.cs → ...on/PostConfigureSlidingExpirationCheck.cs
diff --git a/...t/Revocation/ISessionRevocationService.cs → ...t/Revocation/ISessionRevocationService.cs b/...t/Revocation/ISessionRevocationService.cs → ...t/Revocation/ISessionRevocationService.cs
diff --git a/...Revocation/NopSessionRevocationService.cs → ...Revocation/NopSessionRevocationService.cs b/...Revocation/NopSessionRevocationService.cs → ...Revocation/NopSessionRevocationService.cs
diff --git a/...nt/Revocation/SessionRevocationService.cs → ...nt/Revocation/SessionRevocationService.cs b/...nt/Revocation/SessionRevocationService.cs → ...nt/Revocation/SessionRevocationService.cs
diff --git a/...agement/SessionStore/IUserSessionStore.cs → ...agement/SessionStore/IUserSessionStore.cs b/...agement/SessionStore/IUserSessionStore.cs → ...agement/SessionStore/IUserSessionStore.cs
diff --git a/.../SessionStore/IUserSessionStoreCleanup.cs → .../SessionStore/IUserSessionStoreCleanup.cs b/.../SessionStore/IUserSessionStoreCleanup.cs → .../SessionStore/IUserSessionStoreCleanup.cs
diff --git a/.../SessionStore/InMemoryUserSessionStore.cs → .../SessionStore/InMemoryUserSessionStore.cs b/.../SessionStore/InMemoryUserSessionStore.cs → .../SessionStore/InMemoryUserSessionStore.cs
diff --git a/...gement/SessionStore/SessionCleanupHost.cs → ...gement/SessionStore/SessionCleanupHost.cs b/...gement/SessionStore/SessionCleanupHost.cs → ...gement/SessionStore/SessionCleanupHost.cs
diff --git a/...ionManagement/SessionStore/UserSession.cs → ...ionManagement/SessionStore/UserSession.cs b/...ionManagement/SessionStore/UserSession.cs → ...ionManagement/SessionStore/UserSession.cs
diff --git a/...agement/SessionStore/UserSessionUpdate.cs → ...agement/SessionStore/UserSessionUpdate.cs b/...agement/SessionStore/UserSessionUpdate.cs → ...agement/SessionStore/UserSessionUpdate.cs
diff --git a/...gement/SessionStore/UserSessionsFilter.cs → ...gement/SessionStore/UserSessionsFilter.cs b/...gement/SessionStore/UserSessionsFilter.cs → ...gement/SessionStore/UserSessionsFilter.cs
diff --git a/...agement/TicketStore/IServerTicketStore.cs → ...agement/TicketStore/IServerTicketStore.cs b/...agement/TicketStore/IServerTicketStore.cs → ...agement/TicketStore/IServerTicketStore.cs
diff --git a/...ment/TicketStore/ServerSideTicketStore.cs → ...ment/TicketStore/ServerSideTicketStore.cs b/...ment/TicketStore/ServerSideTicketStore.cs → ...ment/TicketStore/ServerSideTicketStore.cs
diff --git a/...Management/TicketStore/TicketStoreShim.cs → ...Management/TicketStore/TicketStoreShim.cs b/...Management/TicketStore/TicketStoreShim.cs → ...Management/TicketStore/TicketStoreShim.cs
diff --git a/src/Duende.Bff/Shared/ClaimLite.cs → src/Bff/Shared/ClaimLite.cs b/src/Duende.Bff/Shared/ClaimLite.cs → src/Bff/Shared/ClaimLite.cs
diff --git a/...Duende.Bff/Shared/ClaimsLiteExtensions.cs → src/Bff/Shared/ClaimsLiteExtensions.cs b/...Duende.Bff/Shared/ClaimsLiteExtensions.cs → src/Bff/Shared/ClaimsLiteExtensions.cs
diff --git a/src/Duende.Bff/Shared/ClaimsPrincipalLite.cs → src/Bff/Shared/ClaimsPrincipalLite.cs b/src/Duende.Bff/Shared/ClaimsPrincipalLite.cs → src/Bff/Shared/ClaimsPrincipalLite.cs
diff --git a/.../Duende.Bff.Tests/Duende.Bff.Tests.csproj → test/Bff.Tests/Bff.Tests.csproj b/.../Duende.Bff.Tests/Duende.Bff.Tests.csproj → test/Bff.Tests/Bff.Tests.csproj
@@ -2,10 +2,16 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -22,11 +28,20 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.Bff\Duende.Bff.csproj" />
-    <ProjectReference Include="..\..\src\Duende.Bff.Yarp\Duende.Bff.Yarp.csproj" />
+    <ProjectReference Include="..\..\src\Bff.Blazor.Client\Bff.Blazor.Client.csproj" />
+    <ProjectReference Include="..\..\src\Bff.Blazor\Bff.Blazor.csproj" />
+    <ProjectReference Include="..\..\src\Bff.EntityFramework\Bff.EntityFramework.csproj" />
+    <ProjectReference Include="..\..\src\Bff\Bff.csproj" />
+    <ProjectReference Include="..\..\src\Bff.Yarp\Bff.Yarp.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
   </ItemGroup>
 
 </Project>
diff --git a/...ient.UnitTests/AntiforgeryHandlerTests.cs → .../Blazor/Client/AntiforgeryHandlerTests.cs b/...ient.UnitTests/AntiforgeryHandlerTests.cs → .../Blazor/Client/AntiforgeryHandlerTests.cs
diff --git a/...ClientAuthenticationStateProviderTests.cs → ...ClientAuthenticationStateProviderTests.cs b/...ClientAuthenticationStateProviderTests.cs → ...ClientAuthenticationStateProviderTests.cs
diff --git a/...r.Client.UnitTests/GetUserServiceTests.cs → ...ests/Blazor/Client/GetUserServiceTests.cs b/...r.Client.UnitTests/GetUserServiceTests.cs → ...ests/Blazor/Client/GetUserServiceTests.cs
diff --git a/...Tests/ServiceCollectionExtensionsTests.cs → ...lient/ServiceCollectionExtensionsTests.cs b/...Tests/ServiceCollectionExtensionsTests.cs → ...lient/ServiceCollectionExtensionsTests.cs
diff --git a/....Bff.Blazor.Client.UnitTests/TestMocks.cs → test/Bff.Tests/Blazor/Client/TestMocks.cs b/....Bff.Blazor.Client.UnitTests/TestMocks.cs → test/Bff.Tests/Blazor/Client/TestMocks.cs
diff --git a/...or.UnitTests/ServerSideTokenStoreTests.cs → ...Tests/Blazor/ServerSideTokenStoreTests.cs b/...or.UnitTests/ServerSideTokenStoreTests.cs → ...Tests/Blazor/ServerSideTokenStoreTests.cs
@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using System.Threading.Tasks;
 using Duende.AccessTokenManagement.OpenIdConnect;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;

diff --git a/...Bff.Tests/Endpoints/LocalEndpointTests.cs → ...Bff.Tests/Endpoints/LocalEndpointTests.cs b/...Bff.Tests/Endpoints/LocalEndpointTests.cs → ...Bff.Tests/Endpoints/LocalEndpointTests.cs
diff --git a/...agement/BackchannelLogoutEndpointTests.cs → ...agement/BackchannelLogoutEndpointTests.cs b/...agement/BackchannelLogoutEndpointTests.cs → ...agement/BackchannelLogoutEndpointTests.cs
diff --git a/...ndpoints/Management/LoginEndpointTests.cs → ...ndpoints/Management/LoginEndpointTests.cs b/...ndpoints/Management/LoginEndpointTests.cs → ...ndpoints/Management/LoginEndpointTests.cs
diff --git a/...dpoints/Management/LogoutEndpointTests.cs → ...dpoints/Management/LogoutEndpointTests.cs b/...dpoints/Management/LogoutEndpointTests.cs → ...dpoints/Management/LogoutEndpointTests.cs
diff --git a/...nts/Management/ManagementBasePathTests.cs → ...nts/Management/ManagementBasePathTests.cs b/...nts/Management/ManagementBasePathTests.cs → ...nts/Management/ManagementBasePathTests.cs
diff --git a/...Endpoints/Management/UserEndpointTests.cs → ...Endpoints/Management/UserEndpointTests.cs b/...Endpoints/Management/UserEndpointTests.cs → ...Endpoints/Management/UserEndpointTests.cs
diff --git a/...ff.Tests/Endpoints/RemoteEndpointTests.cs → ...ff.Tests/Endpoints/RemoteEndpointTests.cs b/...ff.Tests/Endpoints/RemoteEndpointTests.cs → ...ff.Tests/Endpoints/RemoteEndpointTests.cs
diff --git a/...ests/Endpoints/YarpRemoteEndpointTests.cs → ...ests/Endpoints/YarpRemoteEndpointTests.cs b/...ests/Endpoints/YarpRemoteEndpointTests.cs → ...ests/Endpoints/YarpRemoteEndpointTests.cs
diff --git a/...yFramework.Tests/UserSessionStoreTests.cs → .../EntityFramework/UserSessionStoreTests.cs b/...yFramework.Tests/UserSessionStoreTests.cs → .../EntityFramework/UserSessionStoreTests.cs
diff --git a/test/Duende.Bff.Tests/GenericHostTests.cs → test/Bff.Tests/GenericHostTests.cs b/test/Duende.Bff.Tests/GenericHostTests.cs → test/Bff.Tests/GenericHostTests.cs
diff --git a/...s/Headers/ApiAndBffUseForwardedHeaders.cs → ...s/Headers/ApiAndBffUseForwardedHeaders.cs b/...s/Headers/ApiAndBffUseForwardedHeaders.cs → ...s/Headers/ApiAndBffUseForwardedHeaders.cs
diff --git a/...f.Tests/Headers/ApiUseForwardedHeaders.cs → ...f.Tests/Headers/ApiUseForwardedHeaders.cs b/...f.Tests/Headers/ApiUseForwardedHeaders.cs → ...f.Tests/Headers/ApiUseForwardedHeaders.cs
diff --git a/test/Duende.Bff.Tests/Headers/General.cs → test/Bff.Tests/Headers/General.cs b/test/Duende.Bff.Tests/Headers/General.cs → test/Bff.Tests/Headers/General.cs
diff --git a/....Bff.Tests/Properties/launchSettings.json → .../Bff.Tests/Properties/launchSettings.json b/....Bff.Tests/Properties/launchSettings.json → .../Bff.Tests/Properties/launchSettings.json
diff --git a/...s/SessionManagement/CookieSlidingTests.cs → ...s/SessionManagement/CookieSlidingTests.cs b/...s/SessionManagement/CookieSlidingTests.cs → ...s/SessionManagement/CookieSlidingTests.cs
diff --git a/...sionManagement/RevokeRefreshTokenTests.cs → ...sionManagement/RevokeRefreshTokenTests.cs b/...sionManagement/RevokeRefreshTokenTests.cs → ...sionManagement/RevokeRefreshTokenTests.cs
diff --git a/...nManagement/ServerSideTicketStoreTests.cs → ...nManagement/ServerSideTicketStoreTests.cs b/...nManagement/ServerSideTicketStoreTests.cs → ...nManagement/ServerSideTicketStoreTests.cs
diff --git a/...de.Bff.Tests/TestFramework/ApiResponse.cs → test/Bff.Tests/TestFramework/ApiResponse.cs b/...de.Bff.Tests/TestFramework/ApiResponse.cs → test/Bff.Tests/TestFramework/ApiResponse.cs
diff --git a/...de.Bff.Tests/TestFramework/GenericHost.cs → test/Bff.Tests/TestFramework/GenericHost.cs b/...de.Bff.Tests/TestFramework/GenericHost.cs → test/Bff.Tests/TestFramework/GenericHost.cs
diff --git a/...ende.Bff.Tests/TestFramework/MockClock.cs → test/Bff.Tests/TestFramework/MockClock.cs b/...ende.Bff.Tests/TestFramework/MockClock.cs → test/Bff.Tests/TestFramework/MockClock.cs
diff --git a/...work/MockExternalAuthenticationHandler.cs → ...work/MockExternalAuthenticationHandler.cs b/...work/MockExternalAuthenticationHandler.cs → ...work/MockExternalAuthenticationHandler.cs
diff --git a/...Framework/MockSessionRevocationService.cs → ...Framework/MockSessionRevocationService.cs b/...Framework/MockSessionRevocationService.cs → ...Framework/MockSessionRevocationService.cs
diff --git a/...Duende.Bff.Tests/TestFramework/Records.cs → test/Bff.Tests/TestFramework/Records.cs b/...Duende.Bff.Tests/TestFramework/Records.cs → test/Bff.Tests/TestFramework/Records.cs
diff --git a/....Tests/TestFramework/TestBrowserClient.cs → ....Tests/TestFramework/TestBrowserClient.cs b/....Tests/TestFramework/TestBrowserClient.cs → ....Tests/TestFramework/TestBrowserClient.cs
diff --git a/...Tests/TestFramework/TestLoggerProvider.cs → ...Tests/TestFramework/TestLoggerProvider.cs b/...Tests/TestFramework/TestLoggerProvider.cs → ...Tests/TestFramework/TestLoggerProvider.cs
diff --git a/...de.Bff.Tests/TestFramework/TestPayload.cs → test/Bff.Tests/TestFramework/TestPayload.cs b/...de.Bff.Tests/TestFramework/TestPayload.cs → test/Bff.Tests/TestFramework/TestPayload.cs
diff --git a/test/Duende.Bff.Tests/TestHosts/ApiHost.cs → test/Bff.Tests/TestHosts/ApiHost.cs b/test/Duende.Bff.Tests/TestHosts/ApiHost.cs → test/Bff.Tests/TestHosts/ApiHost.cs
diff --git a/test/Duende.Bff.Tests/TestHosts/BffHost.cs → test/Bff.Tests/TestHosts/BffHost.cs b/test/Duende.Bff.Tests/TestHosts/BffHost.cs → test/Bff.Tests/TestHosts/BffHost.cs
diff --git a/...tHosts/BffHostUsingResourceNamedTokens.cs → ...tHosts/BffHostUsingResourceNamedTokens.cs b/...tHosts/BffHostUsingResourceNamedTokens.cs → ...tHosts/BffHostUsingResourceNamedTokens.cs
diff --git a/...Tests/TestHosts/BffIntegrationTestBase.cs → ...Tests/TestHosts/BffIntegrationTestBase.cs b/...Tests/TestHosts/BffIntegrationTestBase.cs → ...Tests/TestHosts/BffIntegrationTestBase.cs
diff --git a/.../TestHosts/FailureAccessTokenRetriever.cs → .../TestHosts/FailureAccessTokenRetriever.cs b/.../TestHosts/FailureAccessTokenRetriever.cs → .../TestHosts/FailureAccessTokenRetriever.cs
diff --git a/...Bff.Tests/TestHosts/IdentityServerHost.cs → ...Bff.Tests/TestHosts/IdentityServerHost.cs b/...Bff.Tests/TestHosts/IdentityServerHost.cs → ...Bff.Tests/TestHosts/IdentityServerHost.cs
diff --git a/...sts/TestHosts/TestAccessTokenRetriever.cs → ...sts/TestHosts/TestAccessTokenRetriever.cs b/...sts/TestHosts/TestAccessTokenRetriever.cs → ...sts/TestHosts/TestAccessTokenRetriever.cs
diff --git a/...Duende.Bff.Tests/TestHosts/YarpBffHost.cs → test/Bff.Tests/TestHosts/YarpBffHost.cs b/...Duende.Bff.Tests/TestHosts/YarpBffHost.cs → test/Bff.Tests/TestHosts/YarpBffHost.cs
diff --git a/...s/TestHosts/YarpBffIntegrationTestBase.cs → ...s/TestHosts/YarpBffIntegrationTestBase.cs b/...s/TestHosts/YarpBffIntegrationTestBase.cs → ...s/TestHosts/YarpBffIntegrationTestBase.cs
diff --git a/test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj b/test/Duende.Bff.Blazor.Client.UnitTests/Duende.Bff.Blazor.Client.UnitTests.csproj
diff --git a/test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj b/test/Duende.Bff.Blazor.UnitTests/Duende.Bff.Blazor.UnitTests.csproj
diff --git a/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj b/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj