cleanup for net6

Author: leastprivilege

global.json

@@ -1,6 +1,7 @@
 {
   "sdk": {
-    "version": "5.0.100",
-    "rollForward": "latestMajor"
+    "version": "6.0.100",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
   }
 }

src/IdentityModel.AspNetCore.OAuth2Introspection.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
     <PackageId>IdentityModel.AspNetCore.OAuth2Introspection</PackageId>
     <Description>ASP.NET Core authentication handler for validating tokens using OAuth 2.0 introspection</Description>
@@ -35,9 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="5.1.0" />
+    <PackageReference Include="IdentityModel" Version="5.2.0" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="minver" Version="2.5.0" PrivateAssets="All" />
+    <PackageReference Include="minver" Version="3.0.0-alpha.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/Infrastructure/CacheExtensions.cs

@@ -9,22 +9,33 @@
 using System.Security.Claims;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace IdentityModel.AspNetCore.OAuth2Introspection
 {
     internal static class CacheExtensions
     {
-        internal readonly static JsonSerializerOptions Options;
+        private static readonly JsonSerializerOptions Options;
 
         static CacheExtensions()
         {
+            
+#if NET6_0_OR_GREATER
+            Options = new JsonSerializerOptions
+            {
+                IgnoreReadOnlyFields = true,
+                IgnoreReadOnlyProperties = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            };
+#else
             Options = new JsonSerializerOptions
             {
                 IgnoreReadOnlyFields = true,
                 IgnoreReadOnlyProperties = true,
                 IgnoreNullValues = true
             };
+#endif
 
             Options.Converters.Add(new ClaimConverter());
         }

test/Tests/Tests.csproj

@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+  
+  <PropertyGroup Condition=" '$(NETCoreSdkPortableRuntimeIdentifier)' != 'osx-arm64' ">
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(NETCoreSdkPortableRuntimeIdentifier)' == 'osx-arm64' ">
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,6 +30,10 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
+  </ItemGroup>
 
 
 </Project>

test/Tests/Util/PipelineFactory.cs

@@ -12,6 +12,7 @@
 using System.Text;
 using Microsoft.AspNetCore.Http;
 using System;
+using System.Threading.Tasks;
 using IdentityModel.AspNetCore.OAuth2Introspection;
 
 namespace Tests.Util
@@ -41,8 +42,8 @@ public static TestServer CreateServer(Action<OAuth2IntrospectionOptions> options
                 .Configure(app =>
                 {
                     app.UseAuthentication();
-
-                    app.Use(async (context, next) =>
+                    
+                    app.Run(async context =>
                     {
                         var user = context.User;