From b48094132c6ddf88ecf30973e19baa509113f9b2 Mon Sep 17 00:00:00 2001
From: Geert van Horrik <geert@catenalogic.com>
Date: Wed, 15 Nov 2023 07:22:52 +0100
Subject: [PATCH 1/3] Add support for .NET 8

---
 .../Blorc.OpenIdConnect.DemoApp.Server.csproj |  6 +++---
 .../Blorc.OpenIdConnect.DemoApp.csproj        | 10 +++++-----
 .../Blorc.OpenIdConnect.Tests.csproj          |  2 +-
 .../Blorc.OpenIdConnect.csproj                | 19 ++++++++++++++++---
 src/global.json                               |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/Blorc.OpenIdConnect.DemoApp.Server/Blorc.OpenIdConnect.DemoApp.Server.csproj b/src/Blorc.OpenIdConnect.DemoApp.Server/Blorc.OpenIdConnect.DemoApp.Server.csproj
index 57cd034c..36d78a69 100644
--- a/src/Blorc.OpenIdConnect.DemoApp.Server/Blorc.OpenIdConnect.DemoApp.Server.csproj
+++ b/src/Blorc.OpenIdConnect.DemoApp.Server/Blorc.OpenIdConnect.DemoApp.Server.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blorc.OpenIdConnect.DemoApp/Blorc.OpenIdConnect.DemoApp.csproj b/src/Blorc.OpenIdConnect.DemoApp/Blorc.OpenIdConnect.DemoApp.csproj
index e041944e..295c09a0 100644
--- a/src/Blorc.OpenIdConnect.DemoApp/Blorc.OpenIdConnect.DemoApp.csproj
+++ b/src/Blorc.OpenIdConnect.DemoApp/Blorc.OpenIdConnect.DemoApp.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.*" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.*" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.BrowserConsole" Version="1.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.*" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blorc.OpenIdConnect.Tests/Blorc.OpenIdConnect.Tests.csproj b/src/Blorc.OpenIdConnect.Tests/Blorc.OpenIdConnect.Tests.csproj
index a56a5749..4b6a7e07 100644
--- a/src/Blorc.OpenIdConnect.Tests/Blorc.OpenIdConnect.Tests.csproj
+++ b/src/Blorc.OpenIdConnect.Tests/Blorc.OpenIdConnect.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>Blorc.OpenIdConnect.Tests</AssemblyName>
     <RootNamespace>Blorc.OpenIdConnect.Tests</RootNamespace>
     <PackageId>Blorc.OpenIdConnect.Tests</PackageId>
diff --git a/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj b/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
index 48bf78eb..6b0c6181 100644
--- a/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
+++ b/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Blorc.OpenIdConnect</AssemblyName>
     <RootNamespace>Blorc.OpenIdConnect</RootNamespace>
     <PackageId>Blorc.OpenIdConnect</PackageId>
@@ -24,12 +24,25 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.*" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="all" />
   </ItemGroup>
   
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.*" />
+  </ItemGroup>
+  
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net7.0')) ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.*" />
+  </ItemGroup>
+  
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0')) ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Content Remove="package.json" />
     <None Include="package.json" />
diff --git a/src/global.json b/src/global.json
index 25d70c4d..caeea6cd 100644
--- a/src/global.json
+++ b/src/global.json
@@ -3,7 +3,7 @@
         "MSBuild.Sdk.Extras": "3.0.44"
     },
     "sdk": {
-        "version": "7.0.0",
+        "version": "8.0.0",
         "rollForward": "latestMinor",
         "allowPrerelease": false
     }

From aff3108235db269a6656fb493fd70312978f5ab0 Mon Sep 17 00:00:00 2001
From: Geert van Horrik <geert@catenalogic.com>
Date: Wed, 15 Nov 2023 08:38:21 +0100
Subject: [PATCH 2/3] Approve api changes

---
 ....Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Blorc.OpenIdConnect.Tests/PublicApiFacts.Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt b/src/Blorc.OpenIdConnect.Tests/PublicApiFacts.Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt
index 0f91d3b3..ef9a2074 100644
--- a/src/Blorc.OpenIdConnect.Tests/PublicApiFacts.Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt
+++ b/src/Blorc.OpenIdConnect.Tests/PublicApiFacts.Blorc_OpenIdConnect_HasNoBreakingChanges_Async.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
 namespace Blorc.OpenIdConnect
 {
     public class AccessTokenDelegatingHandler : System.Net.Http.DelegatingHandler

From 907a90b569f0829e98ebe11b59039bb108f036c1 Mon Sep 17 00:00:00 2001
From: Geert van Horrik <geert@catenalogic.com>
Date: Wed, 15 Nov 2023 09:01:37 +0100
Subject: [PATCH 3/3] Bump Blorc.Core

---
 src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj b/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
index 6b0c6181..9b883969 100644
--- a/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
+++ b/src/Blorc.OpenIdConnect/Blorc.OpenIdConnect.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blorc.Core" Version="1.2.0" />
+    <PackageReference Include="Blorc.Core" Version="1.3.0" />
     <PackageReference Include="Fody" Version="6.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>