From 8fcb170d89dfef74b5b7d3f2f9fe0f29584b7d1d Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 13:45:33 -0400
Subject: [PATCH 1/6] upgrade to .net 6

---
 Directory.Build.props                                     | 8 ++++----
 src/BlazingComponents/BlazingComponents.csproj            | 2 +-
 src/BlazingPizza.Client/BlazingPizza.Client.csproj        | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                 | 2 +-
 src/BlazingPizza.Server/BlazingPizza.Server.csproj        | 2 +-
 src/BlazingPizza.Server/PizzaStoreContext.cs              | 2 +-
 src/BlazingPizza.Server/SpecialsController.cs             | 2 ++
 src/BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index bb2df7b9..49b8f5e4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>5.0.0</AspNetCoreVersion>
-        <BlazorVersion>5.0.0</BlazorVersion>
-        <EntityFrameworkVersion>5.0.0</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>5.0.0</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>6.0.0-rc.1.21452.15</AspNetCoreVersion>
+        <BlazorVersion>6.0.0-rc.1.21452.15</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0-rc.1.21452.10</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>6.0.0-rc.1.21451.13</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingComponents/BlazingComponents.csproj b/src/BlazingComponents/BlazingComponents.csproj
index 6325ad64..cd034c1a 100644
--- a/src/BlazingComponents/BlazingComponents.csproj
+++ b/src/BlazingComponents/BlazingComponents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
index 5014247d..17486ea0 100644
--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..32150e78 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6391d520..c32275bf 100644
--- a/src/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/PizzaStoreContext.cs b/src/BlazingPizza.Server/PizzaStoreContext.cs
index 51e96e1e..7fa06430 100644
--- a/src/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/src/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/src/BlazingPizza.Server/SpecialsController.cs b/src/BlazingPizza.Server/SpecialsController.cs
index a176844c..91b01483 100644
--- a/src/BlazingPizza.Server/SpecialsController.cs
+++ b/src/BlazingPizza.Server/SpecialsController.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
@@ -20,6 +21,7 @@ public SpecialsController(PizzaStoreContext db)
         [HttpGet]
         public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
         {
+            var foo = _db.Specials.ToList();
             return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
         }
     }
diff --git a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..583d66fe 100644
--- a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 

From 79a04729af2e65c9a601ce5192331acda8e8cfa1 Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 14:39:25 -0400
Subject: [PATCH 2/6] updating to rc2

---
 Directory.Build.props | 8 ++++----
 src/nuget.config      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 49b8f5e4..1048d648 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>6.0.0-rc.1.21452.15</AspNetCoreVersion>
-        <BlazorVersion>6.0.0-rc.1.21452.15</BlazorVersion>
-        <EntityFrameworkVersion>6.0.0-rc.1.21452.10</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>6.0.0-rc.1.21451.13</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>6.0.0-rc.2.21471.1</AspNetCoreVersion>
+        <BlazorVersion>6.0.0-rc.2.21471.1</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0-rc.2.21471.1</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>6.0.0-rc.2.21470.23</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/nuget.config b/src/nuget.config
index c128a804..787160cf 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     </packageSources>
 </configuration>

From d269b716a1d72bb2149849506b07f59a5b3c4489 Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 14:40:43 -0400
Subject: [PATCH 3/6] adding gitignore to ignore sqllite temp files

---
 src/BlazingPizza.Server/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/BlazingPizza.Server/.gitignore

diff --git a/src/BlazingPizza.Server/.gitignore b/src/BlazingPizza.Server/.gitignore
new file mode 100644
index 00000000..3323b0a7
--- /dev/null
+++ b/src/BlazingPizza.Server/.gitignore
@@ -0,0 +1,2 @@
+*.db-shm
+*.db-wal
\ No newline at end of file

From 10d6596f282d138315ec90f148ad2c5ad7fabbeb Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 14:57:37 -0400
Subject: [PATCH 4/6] removing invalid code that i added on accident

---
 src/BlazingPizza.Server/SpecialsController.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/BlazingPizza.Server/SpecialsController.cs b/src/BlazingPizza.Server/SpecialsController.cs
index 91b01483..9c253eb6 100644
--- a/src/BlazingPizza.Server/SpecialsController.cs
+++ b/src/BlazingPizza.Server/SpecialsController.cs
@@ -21,7 +21,6 @@ public SpecialsController(PizzaStoreContext db)
         [HttpGet]
         public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
         {
-            var foo = _db.Specials.ToList();
             return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
         }
     }

From 0ee662f2fe2b2e98d49d59a9eda2046d61e5571c Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 15:05:48 -0400
Subject: [PATCH 5/6] going back to a different rc2 build that works w Hot
 Reload

---
 Directory.Build.props                                     | 6 +++---
 src/BlazingPizza.Client/Pages/Index.razor                 | 2 +-
 src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1048d648..3a7b1f2e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>6.0.0-rc.2.21471.1</AspNetCoreVersion>
-        <BlazorVersion>6.0.0-rc.2.21471.1</BlazorVersion>
-        <EntityFrameworkVersion>6.0.0-rc.2.21471.1</EntityFrameworkVersion>
+        <AspNetCoreVersion>6.0.0-rc.2.21470.37</AspNetCoreVersion>
+        <BlazorVersion>6.0.0-rc.2.21470.37</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0-rc.2.21470.37</EntityFrameworkVersion>
         <SystemNetHttpJsonVersion>6.0.0-rc.2.21470.23</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index ca5ac084..f1309132 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -36,7 +36,7 @@
     }
     else
     {
-        <div class="empty-cart">Choose a pizza<br>to get started</div>
+        <div class="empty-cart">Choose a pizza2<br>to get started</div>
     }
 
     <div class="order-total @(Order.Pizzas.Any() ? "" : "hidden")">
diff --git a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
index 67096b01..f4dd45b4 100644
--- a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
+++ b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
@@ -13,7 +13,7 @@
         </span>
     </div>
     <div>
-        <label>Extra Toppings:</label>
+        <label>222Extra Toppings:</label>
         @if (toppings == null)
         {
             <select class="custom-select" disabled>

From 998ca63d7c6b024277e20120222c3da163652c3a Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 15:07:31 -0400
Subject: [PATCH 6/6] removing invalid code that i added on accident

---
 src/BlazingPizza.Client/Pages/Index.razor                 | 2 +-
 src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index f1309132..ca5ac084 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -36,7 +36,7 @@
     }
     else
     {
-        <div class="empty-cart">Choose a pizza2<br>to get started</div>
+        <div class="empty-cart">Choose a pizza<br>to get started</div>
     }
 
     <div class="order-total @(Order.Pizzas.Any() ? "" : "hidden")">
diff --git a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
index f4dd45b4..67096b01 100644
--- a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
+++ b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
@@ -13,7 +13,7 @@
         </span>
     </div>
     <div>
-        <label>222Extra Toppings:</label>
+        <label>Extra Toppings:</label>
         @if (toppings == null)
         {
             <select class="custom-select" disabled>