From 00ebfb481119d88346cd9d4d53b03181145525e3 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Sun, 29 Sep 2019 23:25:56 +0100
Subject: [PATCH] When using auth, use CascadingAuthenticationState explicitly.
 Fixes #14566

---
 .../content/BlazorServerWeb-CSharp/App.razor  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor
index d6d7170bf2..7b58ea096f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor
@@ -1,22 +1,25 @@
-<Router AppAssembly="@typeof(Program).Assembly">
+@*#if (NoAuth)
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
-@*#if (!NoAuth)
-        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-#else
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-#endif*@
     </Found>
     <NotFound>
-@*#if (!NoAuth)
-        <CascadingAuthenticationState>
-            <LayoutView Layout="@typeof(MainLayout)">
-                <p>Sorry, there's nothing at this address.</p>
-            </LayoutView>
-        </CascadingAuthenticationState>
-#else
         <LayoutView Layout="@typeof(MainLayout)">
             <p>Sorry, there's nothing at this address.</p>
         </LayoutView>
-#endif*@
     </NotFound>
 </Router>
+#else
+<CascadingAuthenticationState>
+    <Router AppAssembly="@typeof(Program).Assembly">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        </Found>
+        <NotFound>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <p>Sorry, there's nothing at this address.</p>
+            </LayoutView>
+        </NotFound>
+    </Router>
+</CascadingAuthenticationState>
+#endif*@