From dc1482a4d86f7d4ba90f55d3bcb2b49a4f0eacff Mon Sep 17 00:00:00 2001
From: Artak <34246760+mkArtakMSFT@users.noreply.github.com>
Date: Thu, 2 Jul 2020 13:01:13 -0700
Subject: [PATCH 1/9] Migrated to net5.0 TFM

---
 Directory.Build.props                                    | 8 ++++----
 src/BlazingComponents/BlazingComponents.csproj           | 3 +--
 src/BlazingPizza.Client/BlazingPizza.Client.csproj       | 9 ++++-----
 .../BlazingPizza.ComponentsLibrary.csproj                | 3 +--
 src/BlazingPizza.Server/BlazingPizza.Server.csproj       | 3 +--
 src/BlazingPizza.Shared/BlazingPizza.Shared.csproj       | 3 +--
 src/nuget.config                                         | 9 +++++++++
 7 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 src/nuget.config

diff --git a/Directory.Build.props b/Directory.Build.props
index cedf01f9..893bcdb1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>3.1.4</AspNetCoreVersion>
-        <BlazorVersion>3.2.0</BlazorVersion>
-        <EntityFrameworkVersion>3.1.4</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>3.2.0</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>5.0.0-preview.7.20326.3</AspNetCoreVersion>
+        <BlazorVersion>5.0.0-preview.7.20326.3</BlazorVersion>
+        <EntityFrameworkVersion>5.0.0-preview.7.20326.1</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>5.0.0-preview.7.20326.1</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingComponents/BlazingComponents.csproj b/src/BlazingComponents/BlazingComponents.csproj
index df017b6f..6325ad64 100644
--- a/src/BlazingComponents/BlazingComponents.csproj
+++ b/src/BlazingComponents/BlazingComponents.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
index 168a9f14..d693a705 100644
--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+    <UseBlazorWebAssembly>true</UseBlazorWebAssembly>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
 
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..6325ad64 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
index d5b96cd0..6391d520 100644
--- a/src/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/nuget.config b/src/nuget.config
new file mode 100644
index 00000000..d1aa0d0d
--- /dev/null
+++ b/src/nuget.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+        <clear />
+        <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+        <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
+    </packageSources>
+</configuration>
\ No newline at end of file

From e374318177a77c665b4e608d4761845ab17854f8 Mon Sep 17 00:00:00 2001
From: Artak Mkrtchyan <artak.services+github@outlook.com>
Date: Thu, 29 Oct 2020 23:27:08 -0700
Subject: [PATCH 2/9] Upgraded to 5.0-rc2

---
 Directory.Build.props                                     | 8 ++++----
 src/BlazingPizza.Client/App.razor                         | 6 +++---
 src/BlazingPizza.Client/BlazingPizza.Client.csproj        | 5 ++---
 src/BlazingPizza.Client/Program.cs                        | 2 +-
 src/BlazingPizza.Client/wwwroot/index.html                | 4 +---
 .../BlazingPizza.ComponentsLibrary.csproj                 | 4 +++-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 893bcdb1..9eda25fe 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>5.0.0-preview.7.20326.3</AspNetCoreVersion>
-        <BlazorVersion>5.0.0-preview.7.20326.3</BlazorVersion>
-        <EntityFrameworkVersion>5.0.0-preview.7.20326.1</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>5.0.0-preview.7.20326.1</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>5.0.0-rc.2.*</AspNetCoreVersion>
+        <BlazorVersion>5.0.0-rc.2.*</BlazorVersion>
+        <EntityFrameworkVersion>5.0.0-rc.2.*</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>5.0.0-rc.2.*</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingPizza.Client/App.razor b/src/BlazingPizza.Client/App.razor
index 815659c4..b2894c07 100644
--- a/src/BlazingPizza.Client/App.razor
+++ b/src/BlazingPizza.Client/App.razor
@@ -1,7 +1,7 @@
 <CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Program).Assembly" Context="routeData">
-        <Found>
-            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
+    <Router AppAssembly="typeof(Program).Assembly">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
                     <RedirectToLogin />
                 </NotAuthorized>
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
index d693a705..5014247d 100644
--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <UseBlazorWebAssembly>true</UseBlazorWebAssembly>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"  Version="$(BlazorVersion)" PrivateAssets="all"  />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
diff --git a/src/BlazingPizza.Client/Program.cs b/src/BlazingPizza.Client/Program.cs
index 52b69fe9..afeee128 100644
--- a/src/BlazingPizza.Client/Program.cs
+++ b/src/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/src/BlazingPizza.Client/wwwroot/index.html b/src/BlazingPizza.Client/wwwroot/index.html
index 7b95b71e..7cee384b 100644
--- a/src/BlazingPizza.Client/wwwroot/index.html
+++ b/src/BlazingPizza.Client/wwwroot/index.html
@@ -12,9 +12,7 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
-        <div class="loading-bar"></div>
-    </app>
+    <div id="app" class="loading-bar"></div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 6325ad64..5284060e 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -8,5 +8,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
-
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
 </Project>

From 7f2cc4745b586db4bd772850ea1fd816f215c11f Mon Sep 17 00:00:00 2001
From: Artak Mkrtchyan <artak.services+github@outlook.com>
Date: Sat, 31 Oct 2020 21:58:20 -0700
Subject: [PATCH 3/9] Fixed the loader div

---
 src/BlazingPizza.Client/App.razor          | 2 +-
 src/BlazingPizza.Client/wwwroot/index.html | 2 +-
 src/BlazingPizza.Server/Startup.cs         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/BlazingPizza.Client/App.razor b/src/BlazingPizza.Client/App.razor
index b2894c07..21d5a455 100644
--- a/src/BlazingPizza.Client/App.razor
+++ b/src/BlazingPizza.Client/App.razor
@@ -1,7 +1,7 @@
 <CascadingAuthenticationState>
     <Router AppAssembly="typeof(Program).Assembly">
         <Found Context="routeData">
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
                 <NotAuthorized>
                     <RedirectToLogin />
                 </NotAuthorized>
diff --git a/src/BlazingPizza.Client/wwwroot/index.html b/src/BlazingPizza.Client/wwwroot/index.html
index 7cee384b..16c87e5c 100644
--- a/src/BlazingPizza.Client/wwwroot/index.html
+++ b/src/BlazingPizza.Client/wwwroot/index.html
@@ -12,7 +12,7 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <div id="app" class="loading-bar"></div>
+    <div id="app"><div class="loading-bar"></div></div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/src/BlazingPizza.Server/Startup.cs b/src/BlazingPizza.Server/Startup.cs
index 72341cfc..053acade 100644
--- a/src/BlazingPizza.Server/Startup.cs
+++ b/src/BlazingPizza.Server/Startup.cs
@@ -18,9 +18,9 @@ public Startup(IConfiguration configuration)
         public IConfiguration Configuration { get; }
 
         public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+        {
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options =>
                 options.UseSqlite("Data Source=pizza.db"));
@@ -61,8 +61,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapControllers();
                 endpoints.MapRazorPages();
+                endpoints.MapControllers();
                 endpoints.MapFallbackToFile("index.html");
             });
         }

From 3e0c3ce5c991d3904d7011af7c198884c8bb0d36 Mon Sep 17 00:00:00 2001
From: Artak <34246760+mkArtakMSFT@users.noreply.github.com>
Date: Sun, 8 Nov 2020 07:56:35 -0800
Subject: [PATCH 4/9] Update to 5.0 RTM packages

---
 Directory.Build.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9eda25fe..7fbdb53b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>5.0.0-rc.2.*</AspNetCoreVersion>
-        <BlazorVersion>5.0.0-rc.2.*</BlazorVersion>
-        <EntityFrameworkVersion>5.0.0-rc.2.*</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>5.0.0-rc.2.*</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>5.0.0.0</AspNetCoreVersion>
+        <BlazorVersion>5.0.0.0</BlazorVersion>
+        <EntityFrameworkVersion>5.0.0.0</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>5.0.0.0</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>

From a41fba2e93b1f4b3e4a0e7811b3f0f0591b6a596 Mon Sep 17 00:00:00 2001
From: Artak <34246760+mkArtakMSFT@users.noreply.github.com>
Date: Sun, 8 Nov 2020 08:40:22 -0800
Subject: [PATCH 5/9] Updated projects to 5.0

---
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 8 ++++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 7 +++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.Client/BlazingPizza.Client.csproj        | 7 ++-----
 .../BlazingPizza.ComponentsLibrary.csproj                 | 8 ++++++--
 .../BlazingPizza.Server/BlazingPizza.Server.csproj        | 3 +--
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 3 +--
 .../BlazingPizza.ComponentsLibrary.csproj                 | 2 ++
 41 files changed, 94 insertions(+), 110 deletions(-)

diff --git a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
index 05f67ca8..04df2ddd 100644
--- a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 3254fa0c..5f51ee3c 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
+
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
index 67de54c2..a833c6be 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
index 966a0353..c50ce7e0 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,14 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
index 67de54c2..a833c6be 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
index 67de54c2..a833c6be 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
index 67de54c2..a833c6be 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
index 67de54c2..a833c6be 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
index 67de54c2..a833c6be 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
index 168a9f14..c6ff02af 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..5f51ee3c 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
diff --git a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6689fcb5..fd7e3c51 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
index 168a9f14..c6ff02af 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 732a0ddf..255af646 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +9,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
+
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
index d5b96cd0..6391d520 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 6e99a7c4..911c57c5 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5284060e..5f51ee3c 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -8,7 +8,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
+
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
+
 </Project>

From 0044c8f0d53f4191af9e9d5ad7b55343499dc005 Mon Sep 17 00:00:00 2001
From: Artak <34246760+mkArtakMSFT@users.noreply.github.com>
Date: Sun, 8 Nov 2020 09:09:02 -0800
Subject: [PATCH 6/9] Updated to 5.0

---
 .../BlazingComponents/BlazingComponents.csproj                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj b/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj
index df017b6f..6325ad64 100644
--- a/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj
+++ b/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From 97128c59f9ab6a2564f878077db29eec1f4a08b5 Mon Sep 17 00:00:00 2001
From: Artak Mkrtchyan <artak.services+github@outlook.com>
Date: Mon, 16 Nov 2020 14:47:33 -0800
Subject: [PATCH 7/9] Fixed the package versions

---
 Directory.Build.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 7fbdb53b..bb2df7b9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>5.0.0.0</AspNetCoreVersion>
-        <BlazorVersion>5.0.0.0</BlazorVersion>
-        <EntityFrameworkVersion>5.0.0.0</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>5.0.0.0</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>5.0.0</AspNetCoreVersion>
+        <BlazorVersion>5.0.0</BlazorVersion>
+        <EntityFrameworkVersion>5.0.0</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>5.0.0</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>

From 0f2f2563f6dcbdca5a4e2a0cc53ccbb3c38bb750 Mon Sep 17 00:00:00 2001
From: Artak Mkrtchyan <artak.services+github@outlook.com>
Date: Thu, 19 Nov 2020 23:43:15 -0800
Subject: [PATCH 8/9] Updated the SavePoints to 5.0

---
 docs/04-refactor-state-management.md                        | 2 +-
 docs/06-authentication-and-authorization.md                 | 6 +++---
 save-points/00-get-started/BlazingPizza.Client/Program.cs   | 2 +-
 .../00-get-started/BlazingPizza.Client/wwwroot/index.html   | 4 ++--
 save-points/00-get-started/BlazingPizza.Server/Startup.cs   | 4 ++--
 .../01-Components-and-layout/BlazingPizza.Client/Program.cs | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../01-Components-and-layout/BlazingPizza.Server/Startup.cs | 5 +++--
 .../02-customize-a-pizza/BlazingPizza.Client/Program.cs     | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../02-customize-a-pizza/BlazingPizza.Server/Startup.cs     | 4 ++--
 .../03-show-order-status/BlazingPizza.Client/Program.cs     | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../03-show-order-status/BlazingPizza.Server/Startup.cs     | 4 ++--
 .../BlazingPizza.Client/Program.cs                          | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../BlazingPizza.Server/Startup.cs                          | 4 ++--
 .../BlazingPizza.Client/Program.cs                          | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../BlazingPizza.Server/Startup.cs                          | 4 ++--
 .../BlazingPizza.Client/Program.cs                          | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../BlazingPizza.Server/Startup.cs                          | 4 ++--
 .../07-javascript-interop/BlazingPizza.Client/Program.cs    | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../07-javascript-interop/BlazingPizza.Server/Startup.cs    | 4 ++--
 .../08-templated-components/BlazingPizza.Client/Program.cs  | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../08-templated-components/BlazingPizza.Server/Startup.cs  | 4 ++--
 .../09-progressive-web-app/BlazingPizza.Client/Program.cs   | 2 +-
 .../BlazingPizza.Client/wwwroot/index.html                  | 4 ++--
 .../09-progressive-web-app/BlazingPizza.Server/Startup.cs   | 4 ++--
 src/BlazingPizza.Client/wwwroot/index.html                  | 4 +++-
 33 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/docs/04-refactor-state-management.md b/docs/04-refactor-state-management.md
index 2d00207f..d76a6f50 100644
--- a/docs/04-refactor-state-management.md
+++ b/docs/04-refactor-state-management.md
@@ -18,7 +18,7 @@ Create a new class called `OrderState` in the Client Project root directory - an
 public static async Task Main(string[] args)
 {
     var builder = WebAssemblyHostBuilder.CreateDefault(args);
-    builder.RootComponents.Add<App>("app");
+    builder.RootComponents.Add<App>("#app");
 
     builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
     builder.Services.AddScoped<OrderState>();
diff --git a/docs/06-authentication-and-authorization.md b/docs/06-authentication-and-authorization.md
index 0596cd18..3bea9069 100644
--- a/docs/06-authentication-and-authorization.md
+++ b/docs/06-authentication-and-authorization.md
@@ -49,7 +49,7 @@ To enable the authentication services, add a call to `AddApiAuthorization` in *P
 public static async Task Main(string[] args)
 {
     var builder = WebAssemblyHostBuilder.CreateDefault(args);
-    builder.RootComponents.Add<App>("app");
+    builder.RootComponents.Add<App>("#app");
 
     builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
     builder.Services.AddScoped<OrderState>();
@@ -68,8 +68,8 @@ The added services will be configured by default to use an identity provider on
 ```csharp
 public void ConfigureServices(IServiceCollection services)
 {
-    services.AddMvc()
-        .AddNewtonsoftJson();
+    services.AddControllersWithViews();
+    services.AddRazorPages();
 
     services.AddDbContext<PizzaStoreContext>(options => 
         options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/00-get-started/BlazingPizza.Client/Program.cs b/save-points/00-get-started/BlazingPizza.Client/Program.cs
index 0f7fdd8e..48147d6f 100644
--- a/save-points/00-get-started/BlazingPizza.Client/Program.cs
+++ b/save-points/00-get-started/BlazingPizza.Client/Program.cs
@@ -11,7 +11,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/00-get-started/BlazingPizza.Client/wwwroot/index.html b/save-points/00-get-started/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/00-get-started/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/00-get-started/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/00-get-started/BlazingPizza.Server/Startup.cs b/save-points/00-get-started/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/00-get-started/BlazingPizza.Server/Startup.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs b/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
index 0f7fdd8e..48147d6f 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
@@ -11,7 +11,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/wwwroot/index.html b/save-points/01-Components-and-layout/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs
index 56307bb5..7c4656a7 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,9 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
+
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs b/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
index 0f7fdd8e..48147d6f 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
@@ -11,7 +11,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/wwwroot/index.html b/save-points/02-customize-a-pizza/BlazingPizza.Client/wwwroot/index.html
index cdccb168..0f1e2190 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Program.cs b/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
index 0f7fdd8e..48147d6f 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
@@ -11,7 +11,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/wwwroot/index.html b/save-points/03-show-order-status/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/03-show-order-status/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs b/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
index 664649aa..e0c88943 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
@@ -11,7 +11,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddScoped<OrderState>();
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/index.html b/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
index 664649aa..e0c88943 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
@@ -11,7 +11,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddScoped<OrderState>();
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/wwwroot/index.html b/save-points/05-checkout-with-validation/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
index 52b69fe9..afeee128 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/wwwroot/index.html b/save-points/06-authentication-and-authorization/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
index 52b69fe9..afeee128 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/wwwroot/index.html b/save-points/07-javascript-interop/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Program.cs b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
index 52b69fe9..afeee128 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/08-templated-components/BlazingPizza.Client/wwwroot/index.html b/save-points/08-templated-components/BlazingPizza.Client/wwwroot/index.html
index 3058d28a..af023fb7 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/08-templated-components/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Startup.cs b/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
index 56307bb5..ed3fca06 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options => 
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
index 52b69fe9..afeee128 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/wwwroot/index.html b/save-points/09-progressive-web-app/BlazingPizza.Client/wwwroot/index.html
index 7b95b71e..0aeae293 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/wwwroot/index.html
@@ -12,9 +12,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
         <div class="loading-bar"></div>
-    </app>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
index 72341cfc..3d59708b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();
 
             services.AddDbContext<PizzaStoreContext>(options =>
                 options.UseSqlite("Data Source=pizza.db"));
diff --git a/src/BlazingPizza.Client/wwwroot/index.html b/src/BlazingPizza.Client/wwwroot/index.html
index 16c87e5c..0aeae293 100644
--- a/src/BlazingPizza.Client/wwwroot/index.html
+++ b/src/BlazingPizza.Client/wwwroot/index.html
@@ -12,7 +12,9 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <div id="app"><div class="loading-bar"></div></div>
+    <div id="app">
+        <div class="loading-bar"></div>
+    </div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.

From a186591fa85a652a11d6b8203af3aaee93a152d9 Mon Sep 17 00:00:00 2001
From: Artak <34246760+mkArtakMSFT@users.noreply.github.com>
Date: Tue, 4 May 2021 08:41:35 -0700
Subject: [PATCH 9/9] Update src/nuget.config

Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
---
 src/nuget.config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/nuget.config b/src/nuget.config
index d1aa0d0d..c128a804 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -4,6 +4,5 @@
         <!--To inherit the global NuGet package sources remove the <clear/> line below -->
         <clear />
         <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-        <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     </packageSources>
-</configuration>
\ No newline at end of file
+</configuration>