damienbod · damienbod · Mar 11, 2023 · Mar 11, 2023 · Mar 11, 2023 · Mar 11, 2023
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0'
+        dotnet-version: '7.0'
         include-prerelease: True
     - name: Restore dependencies
       run: dotnet restore

diff --git a/AspNetCore6.sln → AspNetCore.sln b/AspNetCore6.sln → AspNetCore.sln
@@ -1,93 +1,93 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31410.414
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreRazor", "AspNetCoreRazor\AspNetCoreRazor.csproj", "{29052A43-BB5F-4434-8171-D5FA7DAC471B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.Server", "BlazorBffAzureAD\Server\BlazorHosted.Server.csproj", "{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.Client", "BlazorBffAzureAD\Client\BlazorHosted.Client.csproj", "{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.Shared", "BlazorBffAzureAD\Shared\BlazorHosted.Shared.csproj", "{44701D7C-3BA7-4C63-9870-A196EC17B40A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7F337AB1-98B9-4380-BFFF-3F6422EFDED0}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
-		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreRazorMultiClients", "AspNetCoreRazorMultiClients\AspNetCoreRazorMultiClients.csproj", "{6E52142C-82ED-4AFC-9386-969E16122120}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorBffAzureADWithApi", "BlazorBffAzureADWithApi", "{0437CAB7-043D-4FB6-8A95-C970CE85E58D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBffAzureADWithApi.Shared", "BlazorBffAzureADWithApi\Shared\BlazorBffAzureADWithApi.Shared.csproj", "{0BE784AF-63C5-4E16-858C-1AA9A323A13E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBffAzureADWithApi.Server", "BlazorBffAzureADWithApi\Server\BlazorBffAzureADWithApi.Server.csproj", "{173CD659-BEEB-4189-96ED-EEB14E8E17B6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBffAzureADWithApi.Client", "BlazorBffAzureADWithApi\Client\BlazorBffAzureADWithApi.Client.csproj", "{02B670D4-C9A6-456B-B56E-8EAF8002260A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorBffAzureAD", "BlazorBffAzureAD", "{C9D46001-4199-4CE8-A8FB-54557130D28E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITestClientForApiTest", "BlazorBffAzureADWithApi\UITestClientForApiTest\UITestClientForApiTest.csproj", "{BD4BD465-71CA-4729-B416-877E627206D8}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E52142C-82ED-4AFC-9386-969E16122120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E52142C-82ED-4AFC-9386-969E16122120}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E52142C-82ED-4AFC-9386-969E16122120}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E52142C-82ED-4AFC-9386-969E16122120}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD4BD465-71CA-4729-B416-877E627206D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD4BD465-71CA-4729-B416-877E627206D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD4BD465-71CA-4729-B416-877E627206D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD4BD465-71CA-4729-B416-877E627206D8}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C} = {C9D46001-4199-4CE8-A8FB-54557130D28E}
-		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA} = {C9D46001-4199-4CE8-A8FB-54557130D28E}
-		{44701D7C-3BA7-4C63-9870-A196EC17B40A} = {C9D46001-4199-4CE8-A8FB-54557130D28E}
-		{0BE784AF-63C5-4E16-858C-1AA9A323A13E} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
-		{173CD659-BEEB-4189-96ED-EEB14E8E17B6} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
-		{02B670D4-C9A6-456B-B56E-8EAF8002260A} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
-		{BD4BD465-71CA-4729-B416-877E627206D8} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C038567F-029F-4613-8ABF-22F4ED48AD78}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31410.414
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreRazor", "AspNetCoreRazor\AspNetCoreRazor.csproj", "{29052A43-BB5F-4434-8171-D5FA7DAC471B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.Server", "BlazorBffAzureAD\Server\BlazorHosted.Server.csproj", "{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.Client", "BlazorBffAzureAD\Client\BlazorHosted.Client.csproj", "{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.Shared", "BlazorBffAzureAD\Shared\BlazorHosted.Shared.csproj", "{44701D7C-3BA7-4C63-9870-A196EC17B40A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7F337AB1-98B9-4380-BFFF-3F6422EFDED0}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreRazorMultiClients", "AspNetCoreRazorMultiClients\AspNetCoreRazorMultiClients.csproj", "{6E52142C-82ED-4AFC-9386-969E16122120}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorBffAzureADWithApi", "BlazorBffAzureADWithApi", "{0437CAB7-043D-4FB6-8A95-C970CE85E58D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBffAzureADWithApi.Shared", "BlazorBffAzureADWithApi\Shared\BlazorBffAzureADWithApi.Shared.csproj", "{0BE784AF-63C5-4E16-858C-1AA9A323A13E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBffAzureADWithApi.Server", "BlazorBffAzureADWithApi\Server\BlazorBffAzureADWithApi.Server.csproj", "{173CD659-BEEB-4189-96ED-EEB14E8E17B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBffAzureADWithApi.Client", "BlazorBffAzureADWithApi\Client\BlazorBffAzureADWithApi.Client.csproj", "{02B670D4-C9A6-456B-B56E-8EAF8002260A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorBffAzureAD", "BlazorBffAzureAD", "{C9D46001-4199-4CE8-A8FB-54557130D28E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITestClientForApiTest", "BlazorBffAzureADWithApi\UITestClientForApiTest\UITestClientForApiTest.csproj", "{BD4BD465-71CA-4729-B416-877E627206D8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29052A43-BB5F-4434-8171-D5FA7DAC471B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44701D7C-3BA7-4C63-9870-A196EC17B40A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E52142C-82ED-4AFC-9386-969E16122120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E52142C-82ED-4AFC-9386-969E16122120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E52142C-82ED-4AFC-9386-969E16122120}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E52142C-82ED-4AFC-9386-969E16122120}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BE784AF-63C5-4E16-858C-1AA9A323A13E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{173CD659-BEEB-4189-96ED-EEB14E8E17B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02B670D4-C9A6-456B-B56E-8EAF8002260A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD4BD465-71CA-4729-B416-877E627206D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD4BD465-71CA-4729-B416-877E627206D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD4BD465-71CA-4729-B416-877E627206D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD4BD465-71CA-4729-B416-877E627206D8}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E95A503C-2B98-4531-AC5A-EFA9F4748A8C} = {C9D46001-4199-4CE8-A8FB-54557130D28E}
+		{48E0AAB3-C827-4B40-A0F1-B055AD55DECA} = {C9D46001-4199-4CE8-A8FB-54557130D28E}
+		{44701D7C-3BA7-4C63-9870-A196EC17B40A} = {C9D46001-4199-4CE8-A8FB-54557130D28E}
+		{0BE784AF-63C5-4E16-858C-1AA9A323A13E} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
+		{173CD659-BEEB-4189-96ED-EEB14E8E17B6} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
+		{02B670D4-C9A6-456B-B56E-8EAF8002260A} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
+		{BD4BD465-71CA-4729-B416-877E627206D8} = {0437CAB7-043D-4FB6-8A95-C970CE85E58D}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C038567F-029F-4613-8ABF-22F4ED48AD78}
+	EndGlobalSection
+EndGlobal
diff --git a/AspNetCoreRazor/AspNetCoreRazor.csproj b/AspNetCoreRazor/AspNetCoreRazor.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>aspnet-AspNetCoreRazor-7E2EEDC5-9D3D-4F7E-AE3C-7F4637E7323C</UserSecretsId>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.25.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="1.25.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.5.0" />
     <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.18.0" />
     <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="0.18.0" />
   </ItemGroup>

diff --git a/AspNetCoreRazor/Pages/Shared/_Layout.cshtml b/AspNetCoreRazor/Pages/Shared/_Layout.cshtml
@@ -39,7 +39,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2022 - AspNetCoreRazor - <a asp-area="" asp-page="/Privacy">Privacy</a>
+            &copy; 2023 - AspNetCoreRazor - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
     </footer>
 

diff --git a/AspNetCoreRazorMultiClients/AspNetCoreRazorMultiClients.csproj b/AspNetCoreRazorMultiClients/AspNetCoreRazorMultiClients.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>aspnet-AspNetCoreRazorMultiClients-7E2EEDC5-9D3D-4F7E-AE3C-7F4637E7323C</UserSecretsId>
 	<Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.25.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="1.25.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.5.0" />
     <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.18.0" />
     <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="0.18.0" />
   </ItemGroup>

diff --git a/AspNetCoreRazorMultiClients/Pages/Shared/_Layout.cshtml b/AspNetCoreRazorMultiClients/Pages/Shared/_Layout.cshtml
@@ -39,7 +39,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2022 - AspNetCoreRazorMultiClients - <a asp-area="" asp-page="/Privacy">Privacy</a>
+            &copy; 2023 - AspNetCoreRazorMultiClients - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
     </footer>
 

diff --git a/BlazorBffAzureAD/Client/BlazorHosted.Client.csproj b/BlazorBffAzureAD/Client/BlazorHosted.Client.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorBffAzureAD/Client/Pages/GraphApiCall.razor b/BlazorBffAzureAD/Client/Pages/GraphApiCall.razor
@@ -28,7 +28,7 @@ else
 }
 
 @code {
-    private string[] apiData;
+    private string[]? apiData;
 
     protected override async Task OnInitializedAsync()
     {

diff --git a/BlazorBffAzureAD/Client/Shared/MainLayout.razor b/BlazorBffAzureAD/Client/Shared/MainLayout.razor
@@ -9,7 +9,7 @@
         <div class="top-row px-4 auth">
             <AuthorizeView>
                 <Authorized>
-                    <strong>Hello, @context?.User?.Identity?.Name!</strong>
+                    <strong>Hi @context?.User?.Identity?.Name</strong>
                     <form method="post" action="api/Account/Logout">
                         <AntiForgeryTokenInput/>
                         <button class="btn btn-link" type="submit">Sign out</button>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ else @@
     }
     @code {
-        private string[] apiData;
+        private string[]? apiData;
         protected override async Task OnInitializedAsync()
         {
@@ Expand Down @@