From 77fb8caed1288897d68910cf505b5cb69923b748 Mon Sep 17 00:00:00 2001
From: Jean-Marc Prieur <jmprieur@microsoft.com>
Date: Thu, 18 Jul 2024 10:02:07 -0700
Subject: [PATCH] Cleanup + move to .NET 8 only

---
 .gitignore                                         |  2 ++
 .../1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj   | 14 +-------------
 .../1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj  |  8 +-------
 .../WebApp-OpenIDConnect-DotNet.csproj             |  3 +--
 .../WebApp-OpenIDConnect-DotNet.csproj             |  3 +--
 .../1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj     |  3 +--
 .../2-1-Call-MSGraph/Views/Home/Profile.cshtml     |  3 +--
 .../WebApp-OpenIDConnect-DotNet-graph.csproj       |  3 +--
 .../WebApp-OpenIDConnect-DotNet.csproj             |  2 +-
 .../2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj  |  2 +-
 .../WebApp-OpenIDConnect-DotNet.csproj             | 11 +++++------
 .../2-5-HybridFlow/2-5-HybridFlow.csproj           |  4 +---
 .../2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj |  3 +--
 3-WebApp-multi-APIs/Controllers/HomeController.cs  |  8 ++++----
 .../WebApp-OpenIDConnect-DotNet.csproj             |  5 ++---
 .../4-1-MyOrg/Client/TodoListClient.csproj         | 11 +++++------
 .../TodoListService/TodoListService.csproj         |  2 +-
 .../4-2-B2C/Client/TodoListClient.csproj           |  3 +--
 .../4-2-B2C/TodoListService/TodoListService.csproj |  2 +-
 .../ToDoListClient/ToDoListClient.csproj           |  4 ++--
 .../TodoListService/ToDoListService.csproj         |  2 +-
 .../5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj   |  2 +-
 .../5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj  |  2 +-
 build.bat                                          |  3 +--
 buildAllSlns.proj                                  |  6 +++---
 25 files changed, 41 insertions(+), 70 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f9be227..fb8a29a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,5 @@ packages
 /.vscode
 /2-WebApp-graph-user/2-1-Call-MSGraph/Properties/PublishProfiles
 /2-WebApp-graph-user/2-3-Multi-Tenant/AppCreationScripts/createdApps.html
+/.SharedData
+/out/.s/.output/.responses/.s/.output/.reports
diff --git a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
index 0a064a28..005de6ba 100644
--- a/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
+++ b/1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
@@ -19,19 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.Certificate" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.Certificateless" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.Diagnostics" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.TokenAcquisition" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
index ef566c25..58dd45f0 100644
--- a/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
+++ b/1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -18,12 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.Certificate" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.Certificateless" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.Diagnostics" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.TokenAcquisition" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj
index f829f663..58dd45f0 100644
--- a/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj
+++ b/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -18,7 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj
index f829f663..58dd45f0 100644
--- a/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj
+++ b/1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -18,7 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj
index f829f663..58dd45f0 100644
--- a/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj
+++ b/1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -18,7 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml b/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml
index 5865c838..aaed5b71 100644
--- a/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml
+++ b/2-WebApp-graph-user/2-1-Call-MSGraph/Views/Home/Profile.cshtml
@@ -1,5 +1,4 @@
-@using Newtonsoft.Json.Linq
-@{
+@{
     ViewData["Title"] = "User Profile fetched from MS Graph";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
diff --git a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj
index bcc988aa..af76a6b6 100644
--- a/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj
+++ b/2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet_graph-0701D544-D6FC-4E5A-84E4-B8DD052BA93F</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
     <RootNamespace>CallMSGraph</RootNamespace>
@@ -11,7 +11,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj
index 9de0ee25..b09b39cb 100644
--- a/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj
+++ b/2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
diff --git a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj
index 5e4c019f..04e9e8ab 100644
--- a/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj
+++ b/2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>WebApp-MultiTenant-v2-99C23405-82C0-4B27-8A15-F3B0744E06BE</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
     <RootNamespace>WebApp_OpenIDConnect_DotNet</RootNamespace>
diff --git a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj
index ae0d51b9..da1f2491 100644
--- a/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj
+++ b/2-WebApp-graph-user/2-4-Sovereign-Call-MSGraph/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
 		<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
 	</PropertyGroup>
@@ -17,10 +17,9 @@
 		<None Remove="ReadmeFiles\**" />
 	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
-	  <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
+		<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
+	</ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj b/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj
index 98ba9a20..5586da58 100644
--- a/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj
+++ b/2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj
@@ -1,17 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>WebApp_OpenIDConnect_DotNet</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj
index 67905a50..f02aeb0b 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
   </ItemGroup>
diff --git a/3-WebApp-multi-APIs/Controllers/HomeController.cs b/3-WebApp-multi-APIs/Controllers/HomeController.cs
index e4a8886f..518a5081 100644
--- a/3-WebApp-multi-APIs/Controllers/HomeController.cs
+++ b/3-WebApp-multi-APIs/Controllers/HomeController.cs
@@ -103,13 +103,13 @@ public async Task<IActionResult> Blob()
                     await blobClient.UploadAsync(stream);
                     message = "Blob successfully created";
                 }
-                catch (MicrosoftIdentityWebChallengeUserException ex)
+                catch (MicrosoftIdentityWebChallengeUserException)
                 {
-                    throw ex;
+                    throw;
                 }	
-                catch (MsalUiRequiredException ex)
+                catch (MsalUiRequiredException)
                 {
-                    throw ex;
+                    throw;
                 }
                 catch (Exception ex)
                 {
diff --git a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj
index f2eacfa5..ca3e7fa6 100644
--- a/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj
+++ b/3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -18,8 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.13.4" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.21.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
diff --git a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj
index 7e007b3c..bb859991 100644
--- a/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj
+++ b/4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -18,14 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <Compile Include="..\TodoListService\Models\TodoItem.cs" Link="TodoItem.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TodoListService\TodoListService.csproj" />
+    <PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj b/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj
index b5e2799c..0dbc2afb 100644
--- a/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj
+++ b/4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
diff --git a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj
index aa606f49..23103f97 100644
--- a/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj
+++ b/4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D9</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
@@ -22,7 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
diff --git a/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj b/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj
index b5e2799c..0dbc2afb 100644
--- a/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj
+++ b/4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-TodoListService-03230DB1-5145-408C-A48B-BE3DAFC56C30</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
diff --git a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj
index 742a0652..5a7a5e2d 100644
--- a/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj
+++ b/4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.0.0" />
     <PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="http://json.schemastore.org/modernizrrc" /></VisualStudio></ProjectExtensions>
diff --git a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj
index 69dff381..3dd5bd9a 100644
--- a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj
+++ b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-ToDoListService-BA938C29-8BAB-4664-A688-8FD54049C1C3</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>1</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
diff --git a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj
index becff8c1..6a196946 100644
--- a/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj
+++ b/5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
diff --git a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj
index 659a3770..84fc8efd 100644
--- a/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj
+++ b/5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0; net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
diff --git a/build.bat b/build.bat
index f6fb50a9..6c4dc1d6 100644
--- a/build.bat
+++ b/build.bat
@@ -1,2 +1 @@
-msbuild /t:restore buildAllSlns.proj
-msbuild buildAllSlns.proj
\ No newline at end of file
+msbuild /restore buildAllSlns.proj /v:m
\ No newline at end of file
diff --git a/buildAllSlns.proj b/buildAllSlns.proj
index f41dc2e7..3c135b0d 100644
--- a/buildAllSlns.proj
+++ b/buildAllSlns.proj
@@ -3,12 +3,12 @@
     <Solution Include="**\*.sln" />
   </ItemGroup>
   <Target Name="Build">
-    <MSBuild Projects="@(Solution)" Targets="Build" Properties="Configuration=Release" />
+    <MSBuild Projects="@(Solution)" Targets="Build" Properties="Configuration=Release;Platform=Any CPU;v=m" />
   </Target>
   <Target Name="restore">
-    <MSBuild Projects="@(Solution)" Targets="restore" />
+    <MSBuild Projects="@(Solution)" Targets="restore" Properties="Configuration=Release;Platform=Any CPU;v=m"/>
   </Target>
   <Target Name="clean">
-    <MSBuild Projects="@(Solution)" Targets="clean" />
+    <MSBuild Projects="@(Solution)" Targets="clean" Properties="Configuration=Release;Platform=Any CPU;v=m" />
   </Target>
 </Project>
\ No newline at end of file