upgrade to .net 6

sayedihashimi · sayedihashimi · commit 8fcb170d89df · 2021-09-21T13:45:33.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using IdentityServer4.EntityFramework.Options;`
	`1`	`+using Duende.IdentityServer.EntityFramework.Options;`
`2`	`2`	`using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;`
`3`	`3`	`using Microsoft.EntityFrameworkCore;`
`4`	`4`	`using Microsoft.Extensions.Options;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using System.Diagnostics.CodeAnalysis;`
`2`	`3`	`using System.Linq;`
`3`	`4`	`using System.Threading.Tasks;`
`4`	`5`	`using Microsoft.AspNetCore.Mvc;`
`@@ -20,6 +21,7 @@ public SpecialsController(PizzaStoreContext db)`
`20`	`21`	`[HttpGet]`
`21`	`22`	`public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()`
`22`	`23`	`{`
	`24`	`+ var foo = _db.Specials.ToList();`
`23`	`25`	`return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();`
`24`	`26`	`}`
`25`	`27`	`}`