From e011406e89fa49d7c468a47db874b613a3dc804f Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 15:50:34 +0100
Subject: [PATCH 01/23] Begin making it work

---
 .../.template.config/template.json            | 19 +++++++++---
 .../BlazorWeb-CSharp/Components/App.razor     | 25 +++++++++++++--
 .../Components/Identity/AccountLayout.razor   | 27 ++++++++++++++++
 .../{Layout => Identity}/ManageLayout.razor   |  2 +-
 .../{Layout => Identity}/ManageNavMenu.razor  |  0
 .../Components/Layout/NavMenu.razor           |  7 +----
 .../Pages/Account/Manage/_Imports.razor       |  2 +-
 .../Components/Pages/Account/_Imports.razor   |  1 +
 .../Identity/PageLayoutTypeExtensions.cs      | 31 +++++++++++++++++++
 9 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Layout => Identity}/ManageLayout.razor (93%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Layout => Identity}/ManageNavMenu.razor (100%)
 create mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 9356b1e5a7a1..eab31b974bf5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -67,7 +67,12 @@
           "condition": "(UseWebAssembly && InteractiveAtRoot)",
           "rename": {
             "BlazorWeb-CSharp/Components/Layout/": "./BlazorWeb-CSharp.Client/Layout/",
-            "BlazorWeb-CSharp/Components/Pages/": "./BlazorWeb-CSharp.Client/Pages/",
+            "BlazorWeb-CSharp/Components/Pages/Home.razor": "./BlazorWeb-CSharp.Client/Pages/Home.razor",
+            "BlazorWeb-CSharp/Components/Pages/Home.razor.css": "./BlazorWeb-CSharp.Client/Pages/Home.razor.css",
+            "BlazorWeb-CSharp/Components/Pages/Weather.razor": "./BlazorWeb-CSharp.Client/Pages/Weather.razor",
+            "BlazorWeb-CSharp/Components/Pages/Weather.razor.css": "./BlazorWeb-CSharp.Client/Pages/Weather.razor.css",
+            "BlazorWeb-CSharp/Components/Pages/Counter.razor": "./BlazorWeb-CSharp.Client/Pages/Counter.razor",
+            "BlazorWeb-CSharp/Components/Pages/Counter.razor.css": "./BlazorWeb-CSharp.Client/Pages/Counter.razor.css",
             "BlazorWeb-CSharp/Components/Routes.razor": "./BlazorWeb-CSharp.Client/Routes.razor"
           }
         },
@@ -114,8 +119,6 @@
           "condition": "(!IndividualLocalAuth)",
           "exclude": [
             "BlazorWeb-CSharp/Components/Identity/**",
-            "BlazorWeb-CSharp/Components/Layout/ManageLayout.razor",
-            "BlazorWeb-CSharp/Components/Layout/ManageNavMenu.razor",
             "BlazorWeb-CSharp/Components/Pages/Account/**",
             "BlazorWeb-CSharp/Data/**",
             "BlazorWeb-CSharp/Identity/**",
@@ -189,6 +192,12 @@
           "exclude": [
             "BlazorWeb-CSharp/Data/SqlServer/**"
           ]
+        },
+        {
+          "condition": "(IndividualLocalAuth && !InteractiveAtRoot)",
+          "exclude": [
+            "BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs"
+          ]
         }
       ]
     }
@@ -349,7 +358,7 @@
       "defaultValue": "InteractivePerPage",
       "displayName": "_Interactivity location",
       "description": "Chooses which components will have interactive rendering enabled",
-      "isEnabled": "(InteractivityPlatform != \"None\" && auth == \"None\")",
+      "isEnabled": "(InteractivityPlatform != \"None\")",
       "choices": [
         {
           "choice": "InteractivePerPage",
@@ -413,7 +422,7 @@
     "AllInteractive": {
       "type": "parameter",
       "datatype": "bool",
-      "isEnabled": "(InteractivityPlatform != \"None\" && auth == \"None\")",
+      "isEnabled": "(InteractivityPlatform != \"None\")",
       "defaultValue": "false",
       "displayName": "_Enable interactive rendering globally throughout the site",
       "description": "Configures whether to make every page interactive by applying an interactive render mode at the top level. If false, pages will use static server rendering by default, and can be marked interactive on a per-page or per-component basis."
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 6559a81a3231..3f66b9393436 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -1,4 +1,8 @@
-<!DOCTYPE html>
+@*#if (IndividualLocalAuth)
+@using BlazorWeb_CSharp.Components.Identity
+
+##endif*@
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -15,6 +19,8 @@
     ##endif*@
     @*#if (!InteractiveAtRoot)
     <HeadOutlet />
+    ##elseif (IndividualLocalAuth)
+    <HeadOutlet @rendermode="@RenderModeForPage" />
     ##elseif (UseServer && UseWebAssembly)
     <HeadOutlet @rendermode="@RenderMode.InteractiveAuto" />
     ##elseif (UseServer)
@@ -27,14 +33,29 @@
 <body>
     @*#if (!InteractiveAtRoot)
     <Routes />
-    ##elseif (UseServer && UseWebAssembly) -->
+    ##elseif (IndividualLocalAuth)
+    <Routes @rendermode="@RenderModeForPage" />
+    ##elseif (UseServer && UseWebAssembly)
     <Routes @rendermode="@RenderMode.InteractiveAuto" />
     ##elseif (UseServer)
     <Routes @rendermode="@RenderMode.InteractiveServer" />
     ##else
     <Routes @rendermode="@RenderMode.InteractiveWebAssembly" />
     ##endif*@
+    @*#if (IndividualLocalAuth)
+    <LogoutForm id="logout-form" />
+    ##endif*@
     <script src="_framework/blazor.web.js"></script>
 </body>
 
 </html>
+@*#if (InteractiveAtRoot && IndividualLocalAuth)
+
+@code {
+    [CascadingParameter] HttpContext? HttpContext { get; set; }
+
+    IComponentRenderMode? RenderModeForPage => HttpContext.PageHasLayout<AccountLayout>()
+        ? null
+        : RenderMode.InteractiveServer;
+}
+##endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
new file mode 100644
index 000000000000..fa4c1f80b92c
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
@@ -0,0 +1,27 @@
+@inherits LayoutComponentBase
+@layout BlazorWeb_CSharp.Components.Layout.MainLayout
+@inject NavigationManager Nav
+
+@if (HttpContext is null)
+{
+    <p>Loading...</p>
+}
+else
+{
+    @Body
+}
+
+@code {
+    [CascadingParameter] HttpContext? HttpContext { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        if (HttpContext is null)
+        {
+            // If this code runs, we're currently rendering in interactive mode, so there is no HttpContext.
+            // The identity pages need to set cookies, so they require an HttpContext. To achieve this we
+            // must transition back from interactive mode to a server-rendered page.
+            Nav.Refresh(forceReload: true);
+        }
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageLayout.razor
similarity index 93%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageLayout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageLayout.razor
index e4a7871bbc75..949bc92215cb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageLayout.razor
@@ -1,5 +1,5 @@
 @inherits LayoutComponentBase
-@layout MainLayout
+@layout AccountLayout
 
 <h1>Manage your account</h1>
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageNavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageNavMenu.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageNavMenu.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageNavMenu.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
index 5b38b21d63a7..1cea17303955 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
@@ -1,8 +1,4 @@
-@*#if (IndividualLocalAuth)
-@using BlazorWeb_CSharp.Components.Identity
-
-##endif*@
-<div class="top-row ps-3 navbar navbar-dark">
+<div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="">BlazorWeb-CSharp</a>
     </div>
@@ -47,7 +43,6 @@
                     </NavLink>
                 </div>
                 <div class="nav-item px-3">
-                    <LogoutForm id="logout-form" />
                     <NavLink class="nav-link" href="#" onclick="document.getElementById('logout-form').submit(); return false;">
                         <span class="bi bi-arrow-bar-left" aria-hidden="true"></span> Logout
                     </NavLink>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor
index d605aec1f504..ada5bb010a89 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor
@@ -1,2 +1,2 @@
-@layout BlazorWeb_CSharp.Components.Layout.ManageLayout
+@layout ManageLayout
 @attribute [Microsoft.AspNetCore.Authorization.Authorize]
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor
index dfb627bc86ad..d223beff5040 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor
@@ -1 +1,2 @@
 @using BlazorWeb_CSharp.Components.Identity
+@layout AccountLayout
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs
new file mode 100644
index 000000000000..920fbe8beae4
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Endpoints;
+
+namespace BlazorWeb_CSharp.Components.Identity;
+
+public static class PageLayoutTypeExtensions
+{
+    public static bool PageHasLayout<TLayout>(this HttpContext? httpContext) where TLayout : LayoutComponentBase
+    {
+        var pageTypeMetadata = httpContext?.GetEndpoint()?.Metadata.GetMetadata<ComponentTypeMetadata>();
+        return pageTypeMetadata is not null && ComponentTypeHasLayout<TLayout>(pageTypeMetadata.Type);
+    }
+
+    private static bool ComponentTypeHasLayout<TLayout>(Type componentType) where TLayout : LayoutComponentBase
+    {
+        var layoutType = componentType.GetCustomAttribute<LayoutAttribute>()?.LayoutType;
+        if (layoutType is null)
+        {
+            return false;
+        }
+        else if (layoutType.IsAssignableTo(typeof(TLayout)))
+        {
+            return true;
+        }
+        else
+        {
+            return ComponentTypeHasLayout<TLayout>(layoutType);
+        }
+    }
+}

From 6c49a7acf078d135892b6d217ad39c62dce6ea07 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 15:57:02 +0100
Subject: [PATCH 02/23] Simplify

---
 .../.template.config/template.json            |  6 ----
 .../BlazorWeb-CSharp/Components/App.razor     |  5 ++-
 .../Identity/PageLayoutTypeExtensions.cs      | 31 -------------------
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index eab31b974bf5..b143e359d601 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -192,12 +192,6 @@
           "exclude": [
             "BlazorWeb-CSharp/Data/SqlServer/**"
           ]
-        },
-        {
-          "condition": "(IndividualLocalAuth && !InteractiveAtRoot)",
-          "exclude": [
-            "BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs"
-          ]
         }
       ]
     }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 3f66b9393436..1f9c43eb1020 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -1,6 +1,5 @@
 @*#if (IndividualLocalAuth)
 @using BlazorWeb_CSharp.Components.Identity
-
 ##endif*@
 <!DOCTYPE html>
 <html lang="en">
@@ -52,9 +51,9 @@
 @*#if (InteractiveAtRoot && IndividualLocalAuth)
 
 @code {
-    [CascadingParameter] HttpContext? HttpContext { get; set; }
+    [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
 
-    IComponentRenderMode? RenderModeForPage => HttpContext.PageHasLayout<AccountLayout>()
+    IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
         ? null
         : RenderMode.InteractiveServer;
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs
deleted file mode 100644
index 920fbe8beae4..000000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PageLayoutTypeExtensions.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Endpoints;
-
-namespace BlazorWeb_CSharp.Components.Identity;
-
-public static class PageLayoutTypeExtensions
-{
-    public static bool PageHasLayout<TLayout>(this HttpContext? httpContext) where TLayout : LayoutComponentBase
-    {
-        var pageTypeMetadata = httpContext?.GetEndpoint()?.Metadata.GetMetadata<ComponentTypeMetadata>();
-        return pageTypeMetadata is not null && ComponentTypeHasLayout<TLayout>(pageTypeMetadata.Type);
-    }
-
-    private static bool ComponentTypeHasLayout<TLayout>(Type componentType) where TLayout : LayoutComponentBase
-    {
-        var layoutType = componentType.GetCustomAttribute<LayoutAttribute>()?.LayoutType;
-        if (layoutType is null)
-        {
-            return false;
-        }
-        else if (layoutType.IsAssignableTo(typeof(TLayout)))
-        {
-            return true;
-        }
-        else
-        {
-            return ComponentTypeHasLayout<TLayout>(layoutType);
-        }
-    }
-}

From 380c05b89a49f19e360001337f744f3ffecd9f21 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:27:52 +0100
Subject: [PATCH 03/23] Fix other rendermodes

---
 .../BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor  | 6 ++++++
 .../Components/Identity/AccountLayout.razor                 | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 1f9c43eb1020..0fa8bab6e93b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -55,6 +55,12 @@
 
     IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
         ? null
+        @*#if (UseServer && UseWebAssembly)
+        : RenderMode.InteractiveAuto;
+        ##elseif (UseServer)
         : RenderMode.InteractiveServer;
+        ##else
+        : RenderMode.InteractiveWebAssembly;
+        ##endif*@
 }
 ##endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
index fa4c1f80b92c..6b9107fe293c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
@@ -1,5 +1,9 @@
 @inherits LayoutComponentBase
+@*#if (UseWebAssembly)
+@layout BlazorWeb_CSharp.Client.Layout.MainLayout
+##else
 @layout BlazorWeb_CSharp.Components.Layout.MainLayout
+##endif*@
 @inject NavigationManager Nav
 
 @if (HttpContext is null)

From a369d51baa88304e3071b848b8414a656f7d31e5 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:34:50 +0100
Subject: [PATCH 04/23] Seems that nested "if" is not supported

---
 .../BlazorWeb-CSharp/Components/App.razor     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 0fa8bab6e93b..7ca4099ee45d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -48,19 +48,32 @@
 </body>
 
 </html>
-@*#if (InteractiveAtRoot && IndividualLocalAuth)
+@*#if (!InteractiveAtRoot || !IndividualLocalAuth)
+#elseif (UseServer && UseWebAssembly)
 
 @code {
     [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
 
     IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
         ? null
-        @*#if (UseServer && UseWebAssembly)
         : RenderMode.InteractiveAuto;
-        ##elseif (UseServer)
+}
+#elseif (UseServer)
+
+@code {
+    [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+    IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
+        ? null
         : RenderMode.InteractiveServer;
-        ##else
+}
+#else
+
+@code {
+    [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+    IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
+        ? null
         : RenderMode.InteractiveWebAssembly;
-        ##endif*@
 }
-##endif*@
+#endif*@

From 1574e2bcabbc732d3e92c7144bcd34190dd3ced1 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:46:56 +0100
Subject: [PATCH 05/23] Start moving account files into a single subdir

---
 .../BlazorWeb-CSharp/.template.config/template.json |  12 +++++-------
 ...ntityComponentsEndpointRouteBuilderExtensions.cs |   0
 .../Account}/IdentityRedirectManager.cs             |   0
 ...entityRevalidatingAuthenticationStateProvider.cs |   0
 .../Account => Account/Pages}/ConfirmEmail.razor    |   0
 .../Pages}/ConfirmEmailChange.razor                 |   0
 .../Account => Account/Pages}/ExternalLogin.razor   |   0
 .../Account => Account/Pages}/ForgotPassword.razor  |   0
 .../Pages}/ForgotPasswordConfirmation.razor         |   0
 .../Pages}/InvalidPasswordReset.razor               |   0
 .../Account => Account/Pages}/InvalidUser.razor     |   0
 .../{Pages/Account => Account/Pages}/Lockout.razor  |   0
 .../{Pages/Account => Account/Pages}/Login.razor    |   0
 .../Account => Account/Pages}/LoginWith2fa.razor    |   0
 .../Pages}/LoginWithRecoveryCode.razor              |   0
 .../Pages}/Manage/ChangePassword.razor              |   0
 .../Pages}/Manage/DeletePersonalData.razor          |   0
 .../Pages}/Manage/Disable2fa.razor                  |   0
 .../Account => Account/Pages}/Manage/Email.razor    |   0
 .../Pages}/Manage/EnableAuthenticator.razor         |   0
 .../Pages}/Manage/ExternalLogins.razor              |   0
 .../Pages}/Manage/GenerateRecoveryCodes.razor       |   0
 .../Account => Account/Pages}/Manage/Index.razor    |   0
 .../Pages}/Manage/PersonalData.razor                |   0
 .../Pages}/Manage/ResetAuthenticator.razor          |   0
 .../Pages}/Manage/SetPassword.razor                 |   0
 .../Pages}/Manage/TwoFactorAuthentication.razor     |   0
 .../Account => Account/Pages}/Manage/_Imports.razor |   0
 .../{Pages/Account => Account/Pages}/Register.razor |   0
 .../Pages}/RegisterConfirmation.razor               |   0
 .../Pages}/ResendEmailConfirmation.razor            |   0
 .../Account => Account/Pages}/ResetPassword.razor   |   0
 .../Pages}/ResetPasswordConfirmation.razor          |   0
 .../{Pages/Account => Account/Pages}/_Imports.razor |   0
 ...istingRevalidatingAuthenticationStateProvider.cs |   0
 .../PersistingServerAuthenticationStateProvider.cs  |   0
 .../Shared}/AccountLayout.razor                     |   0
 .../Shared}/ExternalLoginPicker.razor               |   0
 .../{Identity => Account/Shared}/LogoutForm.razor   |   0
 .../{Identity => Account/Shared}/ManageLayout.razor |   0
 .../Shared}/ManageNavMenu.razor                     |   0
 .../Shared}/ShowRecoveryCodes.razor                 |   0
 .../Shared}/StatusMessage.razor                     |   0
 .../BlazorWeb-CSharp/{ => Data}/app.db              | Bin
 .../BlazorWeb-CSharp/appsettings.json               |   2 +-
 45 files changed, 6 insertions(+), 8 deletions(-)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/{Identity/Extensions => Components/Account}/IdentityComponentsEndpointRouteBuilderExtensions.cs (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/{Identity => Components/Account}/IdentityRedirectManager.cs (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/{Identity => Components/Account}/IdentityRevalidatingAuthenticationStateProvider.cs (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ConfirmEmail.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ConfirmEmailChange.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ExternalLogin.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ForgotPassword.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ForgotPasswordConfirmation.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/InvalidPasswordReset.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/InvalidUser.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Lockout.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Login.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/LoginWith2fa.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/LoginWithRecoveryCode.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/ChangePassword.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/DeletePersonalData.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/Disable2fa.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/Email.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/EnableAuthenticator.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/ExternalLogins.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/GenerateRecoveryCodes.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/Index.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/PersonalData.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/ResetAuthenticator.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/SetPassword.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/TwoFactorAuthentication.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Manage/_Imports.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/Register.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/RegisterConfirmation.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ResendEmailConfirmation.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ResetPassword.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/ResetPasswordConfirmation.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Pages/Account => Account/Pages}/_Imports.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/{Identity => Components/Account}/PersistingRevalidatingAuthenticationStateProvider.cs (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/{Identity => Components/Account}/PersistingServerAuthenticationStateProvider.cs (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/AccountLayout.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/ExternalLoginPicker.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/LogoutForm.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/ManageLayout.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/ManageNavMenu.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/ShowRecoveryCodes.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/{Identity => Account/Shared}/StatusMessage.razor (100%)
 rename src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/{ => Data}/app.db (100%)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index b143e359d601..13506f98729f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -118,10 +118,8 @@
         {
           "condition": "(!IndividualLocalAuth)",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Identity/**",
-            "BlazorWeb-CSharp/Components/Pages/Account/**",
+            "BlazorWeb-CSharp/Components/Account/**",
             "BlazorWeb-CSharp/Data/**",
-            "BlazorWeb-CSharp/Identity/**",
             "BlazorWeb-CSharp.Client/PersistentAuthenticationStateProvider.cs",
             "BlazorWeb-CSharp.Client/UserInfo.cs",
             "BlazorWeb-CSharp.Client/Pages/Auth.razor"
@@ -130,7 +128,7 @@
         {
           "condition": "(!(IndividualLocalAuth && !UseLocalDB))",
           "exclude": [
-            "BlazorWeb-CSharp/app.db"
+            "BlazorWeb-CSharp/Data/app.db"
           ]
         },
         {
@@ -142,19 +140,19 @@
         {
           "condition": "(!(IndividualLocalAuth && UseServer && UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Account/PersistingRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && UseServer && !UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && !UseServer && UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Account/PersistingServerAuthenticationStateProvider.cs"
           ]
         },
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRedirectManager.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRedirectManager.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmail.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmail.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmailChange.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmailChange.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ExternalLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ExternalLogin.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPasswordConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPasswordConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPasswordConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPasswordConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidPasswordReset.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidPasswordReset.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidPasswordReset.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidPasswordReset.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidUser.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidUser.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidUser.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidUser.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Lockout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Lockout.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Lockout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Lockout.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Login.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Login.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWith2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWith2fa.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWithRecoveryCode.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWithRecoveryCode.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ChangePassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ChangePassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/DeletePersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/DeletePersonalData.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Disable2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Disable2fa.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Email.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Email.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/EnableAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/EnableAuthenticator.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ExternalLogins.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ExternalLogins.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Index.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Index.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/PersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/PersonalData.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ResetAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ResetAuthenticator.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/SetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/SetPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/TwoFactorAuthentication.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/TwoFactorAuthentication.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Register.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Register.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/RegisterConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/RegisterConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResendEmailConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResendEmailConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPasswordConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPasswordConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPasswordConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPasswordConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/AccountLayout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ExternalLoginPicker.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ExternalLoginPicker.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/LogoutForm.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/LogoutForm.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageLayout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageNavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ManageNavMenu.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ShowRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ShowRecoveryCodes.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ShowRecoveryCodes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ShowRecoveryCodes.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/StatusMessage.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/StatusMessage.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/app.db b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/app.db
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
index a3f1a98503ab..cef6efaeebfe 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
@@ -4,7 +4,7 @@
 //#if (UseLocalDB)
 //    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-BlazorWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
 //#else
-//    "DefaultConnection": "DataSource=app.db;Cache=Shared"
+//    "DefaultConnection": "DataSource=Data\app.db;Cache=Shared"
 //#endif
 //  },
 ////#endif

From cb06df0cf5d1c0e64ca91c4f4116ad7eb7be6778 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 17:03:53 +0100
Subject: [PATCH 06/23] Fix paths

---
 .../content/BlazorWeb-CSharp/.template.config/template.json | 6 +++---
 .../IdentityComponentsEndpointRouteBuilderExtensions.cs     | 4 ++--
 .../Components/Account/IdentityRedirectManager.cs           | 2 +-
 .../IdentityRevalidatingAuthenticationStateProvider.cs      | 2 +-
 .../Components/Account/Pages/ConfirmEmail.razor             | 2 +-
 .../Components/Account/Pages/ConfirmEmailChange.razor       | 2 +-
 .../Components/Account/Pages/ExternalLogin.razor            | 2 +-
 .../Components/Account/Pages/ForgotPassword.razor           | 2 +-
 .../BlazorWeb-CSharp/Components/Account/Pages/Login.razor   | 2 +-
 .../Components/Account/Pages/LoginWith2fa.razor             | 2 +-
 .../Components/Account/Pages/LoginWithRecoveryCode.razor    | 2 +-
 .../Components/Account/Pages/Manage/ChangePassword.razor    | 2 +-
 .../Account/Pages/Manage/DeletePersonalData.razor           | 2 +-
 .../Components/Account/Pages/Manage/Disable2fa.razor        | 2 +-
 .../Components/Account/Pages/Manage/Email.razor             | 2 +-
 .../Account/Pages/Manage/EnableAuthenticator.razor          | 2 +-
 .../Components/Account/Pages/Manage/ExternalLogins.razor    | 2 +-
 .../Account/Pages/Manage/GenerateRecoveryCodes.razor        | 2 +-
 .../Components/Account/Pages/Manage/Index.razor             | 2 +-
 .../Account/Pages/Manage/ResetAuthenticator.razor           | 2 +-
 .../Components/Account/Pages/Manage/SetPassword.razor       | 2 +-
 .../Account/Pages/Manage/TwoFactorAuthentication.razor      | 2 +-
 .../Components/Account/Pages/Register.razor                 | 2 +-
 .../Components/Account/Pages/RegisterConfirmation.razor     | 2 +-
 .../Components/Account/Pages/ResendEmailConfirmation.razor  | 2 +-
 .../Components/Account/Pages/ResetPassword.razor            | 2 +-
 .../Components/Account/Pages/_Imports.razor                 | 3 ++-
 .../PersistingRevalidatingAuthenticationStateProvider.cs    | 2 +-
 .../Account/PersistingServerAuthenticationStateProvider.cs  | 2 +-
 .../Components/Account/Shared/ExternalLoginPicker.razor     | 4 ++--
 .../Components/Account/Shared/LogoutForm.razor              | 2 +-
 .../Components/Account/Shared/StatusMessage.razor           | 2 +-
 .../BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor  | 2 +-
 .../BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs  | 2 +-
 .../BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs       | 2 +-
 .../content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs    | 2 +-
 .../BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json      | 2 +-
 37 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 13506f98729f..e9c7bc1445f5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -140,19 +140,19 @@
         {
           "condition": "(!(IndividualLocalAuth && UseServer && UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Account/PersistingRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && UseServer && !UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && !UseServer && UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Account/PersistingServerAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs"
           ]
         },
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index ea968cb71f5e..d9c00eac61aa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -3,8 +3,8 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using BlazorWeb_CSharp.Components.Pages.Account;
-using BlazorWeb_CSharp.Components.Pages.Account.Manage;
+using BlazorWeb_CSharp.Components.Account.Pages;
+using BlazorWeb_CSharp.Components.Account.Pages.Manage;
 using BlazorWeb_CSharp.Data;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Primitives;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
index 2a1cccde8fc4..d3a78a281ae3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Components;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 internal sealed class IdentityRedirectManager(
     NavigationManager navigationManager,
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
index 237200d2cae0..c1bc3cee89b7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using BlazorWeb_CSharp.Data;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 public class IdentityRevalidatingAuthenticationStateProvider : RevalidatingServerAuthenticationStateProvider
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
index 992c6c59694f..6a17bbb8950a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
index 510fb2d0e93f..f44ce3d24d8f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
index 51bfa81fc116..41e1a6f9d2fe 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
@@ -8,7 +8,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
index 605a676daad5..58ba43220a6d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject NavigationManager NavigationManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
index f49edad1beb7..c250906f07ad 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
@@ -6,7 +6,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject ILogger<Login> Logger
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
index b1a650544608..09884de25baa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
index 41d5d3660810..778fec071161 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.Mvc
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
index aabf71983a62..b9a44982d993 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
index c3ed9c38635a..938c595ec098 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
index 562b5ca26577..060b8355294c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
index c629d0a8ee8e..8f1df8e60f68 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
index 52b3f0d68c5a..f5c0fa6dee15 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
@@ -6,7 +6,7 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
index 4ff1ec38044a..53bd316ca9ec 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.Mvc.ViewFeatures
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
index 3de6f69e9c40..4b298e0116f0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
index 7e59b2732987..a39a411be2cb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
@@ -4,7 +4,7 @@
 @using System.Security.Claims
 @using Microsoft.AspNetCore.Identity;
 @using BlazorWeb_CSharp.Data;
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
index dd951c7d2410..e0fceda2d469 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
index 5f1aff4403ad..563de59e7a25 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
index fbb2f32eddbd..2e36945f569c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Http.Features
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
index 822a95b69460..f1fa5a777ce0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
@@ -8,7 +8,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IUserStore<ApplicationUser> UserStore
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
index 5f54beb59e9a..b911ed1dcffa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
@@ -5,7 +5,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender EmailSender
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
index fa5f9d1dbafe..11eda5ab5df0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender EmailSender
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
index 214c42643eb4..9428e05cd967 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
@@ -6,7 +6,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject IdentityRedirectManager RedirectManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
index d223beff5040..74e55cf461f3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
@@ -1,2 +1,3 @@
-@using BlazorWeb_CSharp.Components.Identity
+@using BlazorWeb_CSharp.Components.Account.Pages
+@using BlazorWeb_CSharp.Components.Account.Shared
 @layout AccountLayout
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
index 4bcaeb392093..8bc1eac3761d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
@@ -9,7 +9,7 @@
 using BlazorWeb_CSharp.Client;
 using BlazorWeb_CSharp.Data;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 public class PersistingRevalidatingAuthenticationStateProvider : RevalidatingServerAuthenticationStateProvider
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
index 6149f109e221..951b87c685a9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Options;
 using BlazorWeb_CSharp.Client;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 public class PersistingServerAuthenticationStateProvider : ServerAuthenticationStateProvider, IDisposable
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
index 5c33681f7021..bb9b65702de1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
@@ -1,8 +1,8 @@
 @using Microsoft.AspNetCore.Authentication
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Components.Pages.Account
+@using BlazorWeb_CSharp.Components.Account.Pages
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
index a08c78fc4cdc..02626deca8d6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject NavigationManager NavigationManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
index 43bcdc0478b6..4d3de9e4e5f3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
@@ -1,4 +1,4 @@
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @{
     var message = Message ?? MessageFromCookie;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 7ca4099ee45d..55eeaf377e4e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -1,5 +1,5 @@
 @*#if (IndividualLocalAuth)
-@using BlazorWeb_CSharp.Components.Identity
+@using BlazorWeb_CSharp.Components.Account.Shared
 ##endif*@
 <!DOCTYPE html>
 <html lang="en">
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs
index f6fefe902c63..165ae58378bd 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Identity;
-using BlazorWeb_CSharp.Identity;
+using BlazorWeb_CSharp.Components.Account;
 
 namespace BlazorWeb_CSharp.Data;
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
index 01d1f6af2312..ecd75c08f5d0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
@@ -14,7 +14,7 @@
 #if (IndividualLocalAuth)
 using BlazorWeb_CSharp.Data;
 #if (UseServer || UseWebAssembly)
-using BlazorWeb_CSharp.Identity;
+using BlazorWeb_CSharp.Components.Account;
 #endif
 #endif
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
index 0cac856a8962..e702f25006dc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
@@ -14,7 +14,7 @@
 #if (IndividualLocalAuth)
 using BlazorWeb_CSharp.Data;
 #if (UseServer || UseWebAssembly)
-using BlazorWeb_CSharp.Identity;
+using BlazorWeb_CSharp.Components.Account;
 #endif
 #endif
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
index cef6efaeebfe..3a18c82e2dc6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
@@ -4,7 +4,7 @@
 //#if (UseLocalDB)
 //    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-BlazorWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
 //#else
-//    "DefaultConnection": "DataSource=Data\app.db;Cache=Shared"
+//    "DefaultConnection": "DataSource=Data\\app.db;Cache=Shared"
 //#endif
 //  },
 ////#endif

From 98a222f7fa4e4bb598526ee687f18e2efe2385d3 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:05:17 +0100
Subject: [PATCH 07/23] Add RedirectToLogin

---
 .../Components/Account/Shared/RedirectToLogin.razor   |  7 +++++++
 .../BlazorWeb-CSharp/Components/Routes.razor          | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
new file mode 100644
index 000000000000..166c41af71e0
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
@@ -0,0 +1,7 @@
+@inject NavigationManager Navigation
+@code {
+    protected override void OnInitialized()
+    {
+        Navigation.NavigateTo($"Account/Login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
index 1426521804d1..c314eb77a02d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
@@ -1,11 +1,18 @@
-@*#if (UseWebAssembly && !InteractiveAtRoot)
+@*#if (IndividualLocalAuth)
+@using BlazorWeb_CSharp.Components.Account.Shared
+##endif*@
+@*#if (UseWebAssembly && !InteractiveAtRoot)
 <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
 ##else
 <Router AppAssembly="@typeof(Program).Assembly">
 ##endif*@
     <Found Context="routeData">
         @*#if (IndividualLocalAuth)
-        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
+        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)"
+            <NotAuthorized>
+                <RedirectToLogin />
+            </NotAuthorized>
+        </AuthorizeRouteView>
         ##else
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
         ##endif*@

From f35f3baefef5dc35113de7c2c48b30ddf4cac59f Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:17:57 +0100
Subject: [PATCH 08/23] Fixes for RedirectToLogin

---
 .../content/BlazorWeb-CSharp/.template.config/template.json | 6 ++++++
 .../Components/Account/Shared/RedirectToLogin.razor         | 2 +-
 .../BlazorWeb-CSharp/Components/Routes.razor                | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index e9c7bc1445f5..46c01aa43014 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -190,6 +190,12 @@
           "exclude": [
             "BlazorWeb-CSharp/Data/SqlServer/**"
           ]
+        },
+        {
+          "condition": "(IndividualLocalAuth && UseWebAssembly)",
+          "rename": {
+            "BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor": "BlazorWeb-CSharp.Client/RedirectToLogin.razor"
+          }
         }
       ]
     }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
index 166c41af71e0..38bc70dbd629 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
@@ -2,6 +2,6 @@
 @code {
     protected override void OnInitialized()
     {
-        Navigation.NavigateTo($"Account/Login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
+        Navigation.NavigateTo($"Account/Login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}", forceLoad: true);
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
index c314eb77a02d..ee69ff447329 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
@@ -1,4 +1,4 @@
-@*#if (IndividualLocalAuth)
+@*#if (IndividualLocalAuth && !UseWebAssembly)
 @using BlazorWeb_CSharp.Components.Account.Shared
 ##endif*@
 @*#if (UseWebAssembly && !InteractiveAtRoot)
@@ -8,7 +8,7 @@
 ##endif*@
     <Found Context="routeData">
         @*#if (IndividualLocalAuth)
-        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)"
+        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)">
             <NotAuthorized>
                 <RedirectToLogin />
             </NotAuthorized>

From 8fec9e9cd253d060b962ebb4fc181d36ceb9fc7a Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:21:13 +0100
Subject: [PATCH 09/23] Fix for per-page interactivity

---
 .../Components/Account/Shared/AccountLayout.razor               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
index 6b9107fe293c..f907a30619a8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
@@ -1,5 +1,5 @@
 @inherits LayoutComponentBase
-@*#if (UseWebAssembly)
+@*#if (UseWebAssembly && InteractiveAtRoot)
 @layout BlazorWeb_CSharp.Client.Layout.MainLayout
 ##else
 @layout BlazorWeb_CSharp.Components.Layout.MainLayout

From 9136aae96d467463a9244b634c38e90b8752585e Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:47:29 +0100
Subject: [PATCH 10/23] Add missing BOMs

---
 .../Components/Account/Shared/AccountLayout.razor               | 2 +-
 .../Components/Account/Shared/RedirectToLogin.razor             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
index f907a30619a8..9177fc08a416 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
@@ -1,4 +1,4 @@
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 @*#if (UseWebAssembly && InteractiveAtRoot)
 @layout BlazorWeb_CSharp.Client.Layout.MainLayout
 ##else
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
index 38bc70dbd629..def633565ee2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
@@ -1,4 +1,4 @@
-@inject NavigationManager Navigation
+@inject NavigationManager Navigation
 @code {
     protected override void OnInitialized()
     {

From a79a907871eda6901805490a21aec1ac6d0ac3fc Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:56:49 +0100
Subject: [PATCH 11/23] Baseline: "new blazor --interactivity none"

---
 .../test/Templates.Tests/template-baselines.json     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index aec10851dc2c..e17d8bacfd6a 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -510,11 +510,7 @@
       "Files": [
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
@@ -522,11 +518,15 @@
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },

From beffe3bc4d1447c94316dfcf9fc82d6269ebbd5a Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:00:24 +0100
Subject: [PATCH 12/23] Baseline NoInteractivityWithIndividualAuth

---
 .../Templates.Tests/template-baselines.json   | 94 ++++++++++---------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index e17d8bacfd6a..fbb88640fde3 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -534,71 +534,73 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity none --auth Individual",
       "Files": [
-        "app.db",
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
-        "Components/Identity/ExternalLoginPicker.razor",
-        "Components/Identity/LogoutForm.razor",
-        "Components/Identity/ShowRecoveryCodes.razor",
-        "Components/Identity/StatusMessage.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
-        "Components/Layout/ManageLayout.razor",
-        "Components/Layout/ManageNavMenu.razor",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Auth.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
-        "Components/Pages/Account/_Imports.razor",
-        "Components/Pages/Account/ConfirmEmail.razor",
-        "Components/Pages/Account/ConfirmEmailChange.razor",
-        "Components/Pages/Account/ExternalLogin.razor",
-        "Components/Pages/Account/ForgotPassword.razor",
-        "Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "Components/Pages/Account/InvalidPasswordReset.razor",
-        "Components/Pages/Account/InvalidUser.razor",
-        "Components/Pages/Account/Lockout.razor",
-        "Components/Pages/Account/Login.razor",
-        "Components/Pages/Account/LoginWith2fa.razor",
-        "Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "Components/Pages/Account/Register.razor",
-        "Components/Pages/Account/RegisterConfirmation.razor",
-        "Components/Pages/Account/ResendEmailConfirmation.razor",
-        "Components/Pages/Account/ResetPassword.razor",
-        "Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "Components/Pages/Account/Manage/_Imports.razor",
-        "Components/Pages/Account/Manage/ChangePassword.razor",
-        "Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "Components/Pages/Account/Manage/Disable2fa.razor",
-        "Components/Pages/Account/Manage/Email.razor",
-        "Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "Components/Pages/Account/Manage/ExternalLogins.razor",
-        "Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "Components/Pages/Account/Manage/Index.razor",
-        "Components/Pages/Account/Manage/PersonalData.razor",
-        "Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "Components/Pages/Account/Manage/SetPassword.razor",
-        "Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Data/app.db",
         "Data/ApplicationDbContext.cs",
         "Data/ApplicationUser.cs",
-        "Data/UserAccessor.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "Identity/IdentityRedirectManager.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "Individual"
     },

From 92252eef121ee86bd3645d628249fd258a30cb07 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:04:47 +0100
Subject: [PATCH 13/23] Baseline UseServerWithIndividualAuth

---
 .../Templates.Tests/template-baselines.json   | 98 ++++++++++---------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index fbb88640fde3..1b3599c069ee 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -635,73 +635,75 @@
       "Template": "blazor",
       "Arguments": "new blazor --auth Individual",
       "Files": [
-        "app.db",
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
-        "Components/Identity/ExternalLoginPicker.razor",
-        "Components/Identity/LogoutForm.razor",
-        "Components/Identity/ShowRecoveryCodes.razor",
-        "Components/Identity/StatusMessage.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
-        "Components/Layout/ManageLayout.razor",
-        "Components/Layout/ManageNavMenu.razor",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Auth.razor",
-        "Components/Pages/Error.razor",
         "Components/Pages/Counter.razor",
+        "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
-        "Components/Pages/Account/_Imports.razor",
-        "Components/Pages/Account/ConfirmEmail.razor",
-        "Components/Pages/Account/ConfirmEmailChange.razor",
-        "Components/Pages/Account/ExternalLogin.razor",
-        "Components/Pages/Account/ForgotPassword.razor",
-        "Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "Components/Pages/Account/InvalidPasswordReset.razor",
-        "Components/Pages/Account/InvalidUser.razor",
-        "Components/Pages/Account/Lockout.razor",
-        "Components/Pages/Account/Login.razor",
-        "Components/Pages/Account/LoginWith2fa.razor",
-        "Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "Components/Pages/Account/Register.razor",
-        "Components/Pages/Account/RegisterConfirmation.razor",
-        "Components/Pages/Account/ResendEmailConfirmation.razor",
-        "Components/Pages/Account/ResetPassword.razor",
-        "Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "Components/Pages/Account/Manage/_Imports.razor",
-        "Components/Pages/Account/Manage/ChangePassword.razor",
-        "Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "Components/Pages/Account/Manage/Disable2fa.razor",
-        "Components/Pages/Account/Manage/Email.razor",
-        "Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "Components/Pages/Account/Manage/ExternalLogins.razor",
-        "Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "Components/Pages/Account/Manage/Index.razor",
-        "Components/Pages/Account/Manage/PersonalData.razor",
-        "Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "Components/Pages/Account/Manage/SetPassword.razor",
-        "Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Data/app.db",
         "Data/ApplicationDbContext.cs",
         "Data/ApplicationUser.cs",
-        "Data/UserAccessor.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "Identity/IdentityRedirectManager.cs",
-        "Identity/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "Individual"
     },

From 7f7728671d5f62c93a86acf23bf35f32ce554e1a Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:05:45 +0100
Subject: [PATCH 14/23] Baseline UseServerWithIndividualAuthAndSqlServer

---
 .../Templates.Tests/template-baselines.json   | 96 ++++++++++---------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index 1b3599c069ee..a1b178a2364f 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -713,70 +713,72 @@
       "Files": [
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
-        "Components/Identity/ExternalLoginPicker.razor",
-        "Components/Identity/LogoutForm.razor",
-        "Components/Identity/ShowRecoveryCodes.razor",
-        "Components/Identity/StatusMessage.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
-        "Components/Layout/ManageLayout.razor",
-        "Components/Layout/ManageNavMenu.razor",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Auth.razor",
-        "Components/Pages/Error.razor",
         "Components/Pages/Counter.razor",
+        "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
-        "Components/Pages/Account/_Imports.razor",
-        "Components/Pages/Account/ConfirmEmail.razor",
-        "Components/Pages/Account/ConfirmEmailChange.razor",
-        "Components/Pages/Account/ExternalLogin.razor",
-        "Components/Pages/Account/ForgotPassword.razor",
-        "Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "Components/Pages/Account/InvalidPasswordReset.razor",
-        "Components/Pages/Account/InvalidUser.razor",
-        "Components/Pages/Account/Lockout.razor",
-        "Components/Pages/Account/Login.razor",
-        "Components/Pages/Account/LoginWith2fa.razor",
-        "Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "Components/Pages/Account/Register.razor",
-        "Components/Pages/Account/RegisterConfirmation.razor",
-        "Components/Pages/Account/ResendEmailConfirmation.razor",
-        "Components/Pages/Account/ResetPassword.razor",
-        "Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "Components/Pages/Account/Manage/_Imports.razor",
-        "Components/Pages/Account/Manage/ChangePassword.razor",
-        "Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "Components/Pages/Account/Manage/Disable2fa.razor",
-        "Components/Pages/Account/Manage/Email.razor",
-        "Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "Components/Pages/Account/Manage/ExternalLogins.razor",
-        "Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "Components/Pages/Account/Manage/Index.razor",
-        "Components/Pages/Account/Manage/PersonalData.razor",
-        "Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "Components/Pages/Account/Manage/SetPassword.razor",
-        "Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
         "Data/ApplicationDbContext.cs",
         "Data/ApplicationUser.cs",
-        "Data/UserAccessor.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "Identity/IdentityRedirectManager.cs",
-        "Identity/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },

From e7346a48bc39c2f7a073e355f394b85bd3fc1b4f Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:07:07 +0100
Subject: [PATCH 15/23] Baseline UseWebAssemblyWithIndividualAuth

---
 .../Templates.Tests/template-baselines.json   | 112 +++++++++---------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index a1b178a2364f..cfb2058e2c95 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -819,81 +819,83 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity webassembly --auth Individual",
       "Files": [
+        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
         "{ProjectName}.sln",
-        "{ProjectName}/app.db",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/Program.cs",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingServerAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/Routes.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Components/Identity/ExternalLoginPicker.razor",
-        "{ProjectName}/Components/Identity/LogoutForm.razor",
-        "{ProjectName}/Components/Identity/ShowRecoveryCodes.razor",
-        "{ProjectName}/Components/Identity/StatusMessage.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
-        "{ProjectName}/Components/Layout/ManageLayout.razor",
-        "{ProjectName}/Components/Layout/ManageNavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
-        "{ProjectName}/Components/Pages/Account/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmail.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmailChange.razor",
-        "{ProjectName}/Components/Pages/Account/ExternalLogin.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidPasswordReset.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidUser.razor",
-        "{ProjectName}/Components/Pages/Account/Lockout.razor",
-        "{ProjectName}/Components/Pages/Account/Login.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWith2fa.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "{ProjectName}/Components/Pages/Account/Register.razor",
-        "{ProjectName}/Components/Pages/Account/RegisterConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResendEmailConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ChangePassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Disable2fa.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Email.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ExternalLogins.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Index.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/PersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/SetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Routes.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
         "{ProjectName}/Data/ApplicationDbContext.cs",
         "{ProjectName}/Data/ApplicationUser.cs",
-        "{ProjectName}/Data/UserAccessor.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "{ProjectName}/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "{ProjectName}/Identity/IdentityRedirectManager.cs",
-        "{ProjectName}/Identity/PersistingServerAuthenticationStateProvider.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
-        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
-        "{ProjectName}.Client/Program.cs",
-        "{ProjectName}.Client/UserInfo.cs",
-        "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.Client/Pages/Auth.razor",
-        "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
-        "{ProjectName}.Client/wwwroot/appsettings.json"
+        "{ProjectName}/wwwroot/favicon.png"
       ],
       "AuthOption": "Individual"
     },

From 48621a20c651cfdc2b14debf7a5a5a6173dcbf86 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:08:01 +0100
Subject: [PATCH 16/23] Baseline UseServerAndWebAssemblyWithIndividualAuth

---
 .../Templates.Tests/template-baselines.json   | 112 +++++++++---------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index cfb2058e2c95..37c5d0bc193a 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -936,81 +936,83 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --auth Individual",
       "Files": [
+        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
         "{ProjectName}.sln",
-        "{ProjectName}/app.db",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/Program.cs",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/Routes.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Components/Identity/ExternalLoginPicker.razor",
-        "{ProjectName}/Components/Identity/LogoutForm.razor",
-        "{ProjectName}/Components/Identity/ShowRecoveryCodes.razor",
-        "{ProjectName}/Components/Identity/StatusMessage.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
-        "{ProjectName}/Components/Layout/ManageLayout.razor",
-        "{ProjectName}/Components/Layout/ManageNavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
-        "{ProjectName}/Components/Pages/Account/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmail.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmailChange.razor",
-        "{ProjectName}/Components/Pages/Account/ExternalLogin.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidPasswordReset.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidUser.razor",
-        "{ProjectName}/Components/Pages/Account/Lockout.razor",
-        "{ProjectName}/Components/Pages/Account/Login.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWith2fa.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "{ProjectName}/Components/Pages/Account/Register.razor",
-        "{ProjectName}/Components/Pages/Account/RegisterConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResendEmailConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ChangePassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Disable2fa.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Email.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ExternalLogins.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Index.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/PersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/SetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Routes.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
         "{ProjectName}/Data/ApplicationDbContext.cs",
         "{ProjectName}/Data/ApplicationUser.cs",
-        "{ProjectName}/Data/UserAccessor.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "{ProjectName}/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "{ProjectName}/Identity/IdentityRedirectManager.cs",
-        "{ProjectName}/Identity/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
-        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
-        "{ProjectName}.Client/Program.cs",
-        "{ProjectName}.Client/UserInfo.cs",
-        "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.Client/Pages/Auth.razor",
-        "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
-        "{ProjectName}.Client/wwwroot/appsettings.json"
+        "{ProjectName}/wwwroot/favicon.png"
       ],
       "AuthOption": "Individual"
     },

From 1ec264ad98cb4c7844c0740dd687d1df4e840c0b Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:09:20 +0100
Subject: [PATCH 17/23] Baseline EmptyUseServerAndWebAssemblyWithIndividualAuth

---
 .../Templates.Tests/template-baselines.json   | 104 +++++++++---------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index 37c5d0bc193a..22b769021e79 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -1201,71 +1201,73 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --empty --auth Individual",
       "Files": [
+        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/_Imports.razor",
         "{ProjectName}.sln",
-        "{ProjectName}/app.db",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/Program.cs",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/Routes.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Components/Identity/ExternalLoginPicker.razor",
-        "{ProjectName}/Components/Identity/LogoutForm.razor",
-        "{ProjectName}/Components/Identity/ShowRecoveryCodes.razor",
-        "{ProjectName}/Components/Identity/StatusMessage.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
-        "{ProjectName}/Components/Layout/ManageLayout.razor",
-        "{ProjectName}/Components/Layout/ManageNavMenu.razor",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
-        "{ProjectName}/Components/Pages/Account/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmail.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmailChange.razor",
-        "{ProjectName}/Components/Pages/Account/ExternalLogin.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidPasswordReset.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidUser.razor",
-        "{ProjectName}/Components/Pages/Account/Lockout.razor",
-        "{ProjectName}/Components/Pages/Account/Login.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWith2fa.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "{ProjectName}/Components/Pages/Account/Register.razor",
-        "{ProjectName}/Components/Pages/Account/RegisterConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResendEmailConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ChangePassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Disable2fa.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Email.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ExternalLogins.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Index.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/PersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/SetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Routes.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
         "{ProjectName}/Data/ApplicationDbContext.cs",
         "{ProjectName}/Data/ApplicationUser.cs",
-        "{ProjectName}/Data/UserAccessor.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "{ProjectName}/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "{ProjectName}/Identity/IdentityRedirectManager.cs",
-        "{ProjectName}/Identity/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
-        "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
-        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
-        "{ProjectName}.Client/Program.cs",
-        "{ProjectName}.Client/UserInfo.cs",
-        "{ProjectName}.Client/_Imports.razor"
+        "{ProjectName}/wwwroot/app.css"
       ],
       "AuthOption": "Individual"
     }

From d1164eef78472fa8b0d4a5ce5e120a82c4097f83 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:11:46 +0100
Subject: [PATCH 18/23] Baseline ServerInteractiveAtRootWithIndividualAuth

---
 .../Templates.Tests/template-baselines.json   | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index 22b769021e79..78348de31c73 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -1270,6 +1270,82 @@
         "{ProjectName}/wwwroot/app.css"
       ],
       "AuthOption": "Individual"
+    },
+    "ServerInteractiveAtRootWithIndividualAuth": {
+      "Template": "blazor",
+      "Arguments": "new blazor --all-interactive --auth Individual",
+      "Files": [
+        "appsettings.Development.json",
+        "appsettings.json",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
+        "Components/App.razor",
+        "Components/Layout/MainLayout.razor",
+        "Components/Layout/MainLayout.razor.css",
+        "Components/Layout/NavMenu.razor",
+        "Components/Layout/NavMenu.razor.css",
+        "Components/Pages/Auth.razor",
+        "Components/Pages/Counter.razor",
+        "Components/Pages/Error.razor",
+        "Components/Pages/Home.razor",
+        "Components/Pages/Weather.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Data/app.db",
+        "Data/ApplicationDbContext.cs",
+        "Data/ApplicationUser.cs",
+        "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
+        "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
+        "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
+        "Properties/launchSettings.json",
+        "wwwroot/app.css",
+        "wwwroot/bootstrap/bootstrap.min.css",
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
+      ],
+      "AuthOption": "Individual"
     }
   },
   "web": {

From 7fd02fec256f85211344613bef92e406c7c7f5ba Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:13:52 +0100
Subject: [PATCH 19/23] More new baselines

---
 .../Templates.Tests/template-baselines.json   | 168 ++++++++++++++++++
 1 file changed, 168 insertions(+)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index 78348de31c73..c41fdd6671a4 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -1346,6 +1346,174 @@
         "{ProjectName}.csproj"
       ],
       "AuthOption": "Individual"
+    },
+    "WebAssemblyInteractiveAtRootWithIndividualAuth": {
+      "Template": "blazor",
+      "Arguments": "new blazor --interactivity WebAssembly --all-interactive --auth Individual",
+      "Files": [
+        "{ProjectName}.Client/Layout/MainLayout.razor",
+        "{ProjectName}.Client/Layout/MainLayout.razor.css",
+        "{ProjectName}.Client/Layout/NavMenu.razor",
+        "{ProjectName}.Client/Layout/NavMenu.razor.css",
+        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/Weather.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/Routes.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingServerAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
+        "{ProjectName}/Data/ApplicationDbContext.cs",
+        "{ProjectName}/Data/ApplicationUser.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
+        "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png"
+      ],
+      "AuthOption": "Individual"
+    },
+    "AutoInteractiveAtRootWithIndividualAuth": {
+      "Template": "blazor",
+      "Arguments": "new blazor --interactivity Auto --all-interactive --auth Individual",
+      "Files": [
+        "{ProjectName}.Client/Layout/MainLayout.razor",
+        "{ProjectName}.Client/Layout/MainLayout.razor.css",
+        "{ProjectName}.Client/Layout/NavMenu.razor",
+        "{ProjectName}.Client/Layout/NavMenu.razor.css",
+        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/Weather.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/Routes.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
+        "{ProjectName}/Data/ApplicationDbContext.cs",
+        "{ProjectName}/Data/ApplicationUser.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
+        "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png"
+      ],
+      "AuthOption": "Individual"
     }
   },
   "web": {

From 3df5adb12af502aa00557b1ebe615676714cb1cb Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:29:32 +0100
Subject: [PATCH 20/23] Fix mistake and add docs on generating baselines

---
 src/ProjectTemplates/README-BASELINES.md      | 19 ++++++++++++++++++
 .../Templates.Tests/template-baselines.json   | 20 +++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 src/ProjectTemplates/README-BASELINES.md

diff --git a/src/ProjectTemplates/README-BASELINES.md b/src/ProjectTemplates/README-BASELINES.md
new file mode 100644
index 000000000000..83d503a645a5
--- /dev/null
+++ b/src/ProjectTemplates/README-BASELINES.md
@@ -0,0 +1,19 @@
+# Generating template-baselines.json
+
+For small project template changes, you may be able to edit the `template-baselines.json` file manually. This is a good way to ensure you have correct expectations about the effects of your changes.
+
+For larger changes such as adding entirely new templates, it may be impractical to type out the changes to `template-baselines.json` manually. In those cases you can follow a procedure like the following.
+
+  1. Ensure you've configured the necessary environment variables:
+      - `set PATH=c:\git\dotnet\aspnetcore\.dotnet\;%PATH%` (update path as needed)
+      - `set DOTNET_ROOT=c:\git\dotnet\aspnetcore\.dotnet` (update path as needed)
+  2. Get to a position where you can execute the modified template(s) locally, i.e.:
+    - Use `dotnet pack ProjectTemplatesNoDeps.slnf` (possibly with `--no-restore --no-dependencies`) to regenerate `Microsoft.DotNet.Web.ProjectTemplates.*.nupkg`
+    - Run one of the `scripts/*.ps1` scripts to install your template pack and execute your chosen template. For example, run `powershell .\scripts\Run-BlazorWeb-Locally.ps1`
+    - Once that has run, you should see your updated template listed when you execute `dotnet new list` or `dotnet new YourTemplateName --help`. At the point you can run `dotnet new YourTemplateName -o SomePath` directly if you want. However each time you edit template sources further, you will need to run `dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0` and then go back to the start of this whole step.
+    - Tip: the following command combines the above steps, to go directly from editing template sources to an updated local project output: `dotnet pack ProjectTemplatesNoDeps.slnf --no-restore --no-dependencies && dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0 && rm -rf scripts\MyBlazorApp && powershell .\scripts\Run-BlazorWeb-Locally.ps1`
+  3. After generating a particular project's output, the following can be run in a Bash prompt (e.g., using WSL):
+    - `cd src/ProjectTemplates/scripts`
+    - `export PROJECT_NAME=MyBlazorApp` (update as necessary - note this is the name of the directly under `scripts` containing your project output)
+    - `find $PROJECT_NAME -type f -not -path "*/obj/*" -not -path "*/bin/*" -not -path "*/.publish/*" | sed -e "s/^$PROJECT_NAME\///" | sed -e "s/$PROJECT_NAME/{ProjectName}/g" | sed 's/.*/        "&",/' | sort -f`
+    - This will emit the JSON-formatted lines you can manually insert into the relevant place inside `template-baselines.json`
diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index c41fdd6671a4..4c2e6de37cfa 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -819,7 +819,7 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity webassembly --auth Individual",
       "Files": [
-        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/Pages/Auth.razor",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
@@ -889,7 +889,7 @@
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "{ProjectName}/Data/UserAccessor.cs",
-        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/{ProjectName}.csproj",
         "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
@@ -936,7 +936,7 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --auth Individual",
       "Files": [
-        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/Pages/Auth.razor",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
@@ -1006,7 +1006,7 @@
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "{ProjectName}/Data/UserAccessor.cs",
-        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/{ProjectName}.csproj",
         "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
@@ -1201,7 +1201,7 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --empty --auth Individual",
       "Files": [
-        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/RedirectToLogin.razor",
@@ -1264,7 +1264,7 @@
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "{ProjectName}/Data/UserAccessor.cs",
-        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/{ProjectName}.csproj",
         "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css"
@@ -1355,7 +1355,7 @@
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
-        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/Pages/Auth.razor",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/Pages/Home.razor",
@@ -1421,7 +1421,7 @@
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "{ProjectName}/Data/UserAccessor.cs",
-        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/{ProjectName}.csproj",
         "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
@@ -1439,7 +1439,7 @@
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
-        "{ProjectName}.Client/MyBlazorApp.Client.csproj",
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/Pages/Auth.razor",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/Pages/Home.razor",
@@ -1505,7 +1505,7 @@
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "{ProjectName}/Data/UserAccessor.cs",
-        "{ProjectName}/MyBlazorApp.csproj",
+        "{ProjectName}/{ProjectName}.csproj",
         "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",

From 27534b5ad455589b4cff1482973742e715bc25d8 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:30:45 +0100
Subject: [PATCH 21/23] Fix formatting

---
 src/ProjectTemplates/README-BASELINES.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ProjectTemplates/README-BASELINES.md b/src/ProjectTemplates/README-BASELINES.md
index 83d503a645a5..7268cd5eee1f 100644
--- a/src/ProjectTemplates/README-BASELINES.md
+++ b/src/ProjectTemplates/README-BASELINES.md
@@ -5,15 +5,15 @@ For small project template changes, you may be able to edit the `template-baseli
 For larger changes such as adding entirely new templates, it may be impractical to type out the changes to `template-baselines.json` manually. In those cases you can follow a procedure like the following.
 
   1. Ensure you've configured the necessary environment variables:
-      - `set PATH=c:\git\dotnet\aspnetcore\.dotnet\;%PATH%` (update path as needed)
-      - `set DOTNET_ROOT=c:\git\dotnet\aspnetcore\.dotnet` (update path as needed)
+        - `set PATH=c:\git\dotnet\aspnetcore\.dotnet\;%PATH%` (update path as needed)
+        - `set DOTNET_ROOT=c:\git\dotnet\aspnetcore\.dotnet` (update path as needed)
   2. Get to a position where you can execute the modified template(s) locally, i.e.:
-    - Use `dotnet pack ProjectTemplatesNoDeps.slnf` (possibly with `--no-restore --no-dependencies`) to regenerate `Microsoft.DotNet.Web.ProjectTemplates.*.nupkg`
-    - Run one of the `scripts/*.ps1` scripts to install your template pack and execute your chosen template. For example, run `powershell .\scripts\Run-BlazorWeb-Locally.ps1`
-    - Once that has run, you should see your updated template listed when you execute `dotnet new list` or `dotnet new YourTemplateName --help`. At the point you can run `dotnet new YourTemplateName -o SomePath` directly if you want. However each time you edit template sources further, you will need to run `dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0` and then go back to the start of this whole step.
-    - Tip: the following command combines the above steps, to go directly from editing template sources to an updated local project output: `dotnet pack ProjectTemplatesNoDeps.slnf --no-restore --no-dependencies && dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0 && rm -rf scripts\MyBlazorApp && powershell .\scripts\Run-BlazorWeb-Locally.ps1`
+        - Use `dotnet pack ProjectTemplatesNoDeps.slnf` (possibly with `--no-restore --no-dependencies`) to regenerate `Microsoft.DotNet.Web.ProjectTemplates.*.nupkg`
+        - Run one of the `scripts/*.ps1` scripts to install your template pack and execute your chosen template. For example, run `powershell .\scripts\Run-BlazorWeb-Locally.ps1`
+        - Once that has run, you should see your updated template listed when you execute `dotnet new list` or `dotnet new YourTemplateName --help`. At the point you can run `dotnet new YourTemplateName -o SomePath` directly if you want. However each time you edit template sources further, you will need to run `dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0` and then go back to the start of this whole step.
+        - Tip: the following command combines the above steps, to go directly from editing template sources to an updated local project output: `dotnet pack ProjectTemplatesNoDeps.slnf --no-restore --no-dependencies && dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0 && rm -rf scripts\MyBlazorApp && powershell .\scripts\Run-BlazorWeb-Locally.ps1`
   3. After generating a particular project's output, the following can be run in a Bash prompt (e.g., using WSL):
-    - `cd src/ProjectTemplates/scripts`
-    - `export PROJECT_NAME=MyBlazorApp` (update as necessary - note this is the name of the directly under `scripts` containing your project output)
-    - `find $PROJECT_NAME -type f -not -path "*/obj/*" -not -path "*/bin/*" -not -path "*/.publish/*" | sed -e "s/^$PROJECT_NAME\///" | sed -e "s/$PROJECT_NAME/{ProjectName}/g" | sed 's/.*/        "&",/' | sort -f`
-    - This will emit the JSON-formatted lines you can manually insert into the relevant place inside `template-baselines.json`
+        - `cd src/ProjectTemplates/scripts`
+        - `export PROJECT_NAME=MyBlazorApp` (update as necessary - note this is the name of the directly under `scripts` containing your project output)
+        - `find $PROJECT_NAME -type f -not -path "*/obj/*" -not -path "*/bin/*" -not -path "*/.publish/*" | sed -e "s/^$PROJECT_NAME\///" | sed -e "s/$PROJECT_NAME/{ProjectName}/g" | sed 's/.*/        "&",/' | sort -f`
+        - This will emit the JSON-formatted lines you can manually insert into the relevant place inside `template-baselines.json`

From eaf72c0365f7f23eef02dcb90af14a0e75f1417e Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 13:01:25 +0100
Subject: [PATCH 22/23] Fix baseline for UseWebAssemblyInteractiveAtRoot

---
 .../Templates.Tests/template-baselines.json   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index 4c2e6de37cfa..fd736d2dfa50 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -1047,32 +1047,32 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity webassembly --all-interactive",
       "Files": [
-        "{ProjectName}/appsettings.Development.json",
-        "{ProjectName}/appsettings.json",
-        "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Program.cs",
-        "{ProjectName}/Properties/launchSettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
-        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}.Client/Layout/MainLayout.razor",
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
         "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/Pages/Error.razor",
         "{ProjectName}.Client/Pages/Home.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/Routes.razor",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/wwwroot/appsettings.Development.json",
         "{ProjectName}.Client/wwwroot/appsettings.json",
         "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.sln"
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png",
+        "{ProjectName}/{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },

From 17158d51da41cb91edf36d88da862494481a2289 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 26 Sep 2023 13:03:35 +0100
Subject: [PATCH 23/23] Fix baseline for
 UseServerAndWebAssemblyInteractiveAtRoot

---
 .../Templates.Tests/template-baselines.json   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index fd736d2dfa50..da753a4a03bb 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -1080,32 +1080,32 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --all-interactive",
       "Files": [
-        "{ProjectName}/appsettings.Development.json",
-        "{ProjectName}/appsettings.json",
-        "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Program.cs",
-        "{ProjectName}/Properties/launchSettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
-        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}.Client/Layout/MainLayout.razor",
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
         "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/Pages/Error.razor",
         "{ProjectName}.Client/Pages/Home.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/Routes.razor",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/wwwroot/appsettings.Development.json",
         "{ProjectName}.Client/wwwroot/appsettings.json",
         "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.sln"
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png",
+        "{ProjectName}/{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },