diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor index 8bb35f5770ed..8376cb835de9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor @@ -5,6 +5,7 @@ + Not found

Sorry, there's nothing at this address.

 @@ -18,6 +19,7 @@ + Not found

Sorry, there's nothing at this address.

 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Counter.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Counter.razor index 6324ad08efa3..ef23cb31607f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Counter.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Counter.razor @@ -1,5 +1,7 @@ @page "/counter" +Counter +

Counter

Current count: @currentCount

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor index 07550a157a70..43c71965203a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/FetchData.razor @@ -1,5 +1,7 @@ @page "/fetchdata" +Weather forecast + @using BlazorServerWeb_CSharp.Data @inject WeatherForecastService ForecastService diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Index.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Index.razor index e54d914390e1..6085c4aa96f4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Index.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Index.razor @@ -1,5 +1,7 @@ @page "/" +Index +

Hello, world!

Welcome to your new app. diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml index 4bf3d6689c88..c8b0009bc2a2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml @@ -2,34 +2,7 @@ @namespace BlazorServerWeb_CSharp.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ - Layout = null; + Layout = "_Layout"; } - - - - - - BlazorServerWeb-CSharp - - - - - - - - -
- - An error has occurred. This application may no longer respond until reloaded. - - - An unhandled exception has occurred. See browser dev tools for details. - - Reload - 🗙 -
- - - - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Layout.cshtml new file mode 100644 index 000000000000..6da57eb4b0c1 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Layout.cshtml @@ -0,0 +1,33 @@ +@using Microsoft.AspNetCore.Components.Web +@namespace BlazorServerWeb_CSharp.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + + + + + + + BlazorServerWeb-CSharp + + + + + + + + @RenderBody() + +
+ + An error has occurred. This application may no longer respond until reloaded. + + + An unhandled exception has occurred. See browser dev tools for details. + + Reload + 🗙 +
+ + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/App.razor index db4035900ad0..15669dfec87b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/App.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/App.razor @@ -5,6 +5,7 @@ + Not found

Sorry, there's nothing at this address.

 @@ -29,6 +30,7 @@ + Not found

Sorry, there's nothing at this address.

 diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Counter.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Counter.razor index 6324ad08efa3..ef23cb31607f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Counter.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Counter.razor @@ -1,5 +1,7 @@ @page "/counter" +Counter +

Counter

Current count: @currentCount

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor index c7f29e303752..ecbc1fd28532 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/FetchData.razor @@ -11,6 +11,8 @@ #endif*@ @inject HttpClient Http +Weather forecast +

Weather forecast

This component demonstrates fetching data from the server.

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Index.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Index.razor index e4f568b97af4..e3ea51834b1f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Index.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Pages/Index.razor @@ -1,5 +1,7 @@ @page "/" +Index +

Hello, world!

@*#if (MissingAuthority) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Program.cs index c66840010a5e..42bc564d9a8c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Program.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/Program.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Components.Web; #if (!NoAuth && Hosted) using Microsoft.AspNetCore.Components.WebAssembly.Authentication; #endif @@ -10,6 +11,7 @@ var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); +builder.RootComponents.Add("head::after"); #if (!Hosted || NoAuth) builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index a149fd5afd52..e72fe26a924b 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -900,6 +900,7 @@ "Pages/FetchData.razor", "Pages/Index.razor", "Pages/_Host.cshtml", + "Pages/_Layout.cshtml", "Properties/launchSettings.json", "Shared/LoginDisplay.razor", "Shared/MainLayout.razor", @@ -939,6 +940,7 @@ "Pages/FetchData.razor", "Pages/Index.razor", "Pages/_Host.cshtml", + "Pages/_Layout.cshtml", "Properties/launchSettings.json", "Shared/LoginDisplay.razor", "Shared/MainLayout.razor", @@ -978,6 +980,7 @@ "Pages/FetchData.razor", "Pages/Index.razor", "Pages/_Host.cshtml", + "Pages/_Layout.cshtml", "Properties/launchSettings.json", "Shared/LoginDisplay.razor", "Shared/MainLayout.razor", @@ -1017,6 +1020,7 @@ "Pages/FetchData.razor", "Pages/Index.razor", "Pages/_Host.cshtml", + "Pages/_Layout.cshtml", "Properties/launchSettings.json", "Shared/MainLayout.razor", "Shared/MainLayout.razor.css", @@ -1055,6 +1059,7 @@ "Pages/FetchData.razor", "Pages/Index.razor", "Pages/_Host.cshtml", + "Pages/_Layout.cshtml", "Properties/launchSettings.json", "Shared/LoginDisplay.razor", "Shared/MainLayout.razor", @@ -1094,6 +1099,7 @@ "Pages/FetchData.razor", "Pages/Index.razor", "Pages/_Host.cshtml", + "Pages/_Layout.cshtml", "Properties/launchSettings.json", "Shared/LoginDisplay.razor", "Shared/MainLayout.razor",