chore(deps): update to .net 9

cnblogs-dudu · cnblogs-dudu · commit 46d9ca13aff1 · 2025-05-04T18:57:01.000+08:00
diff --git a/build/Program.cs b/build/Program.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using System.Threading.Tasks;
 using static Bullseye.Targets;
 using static SimpleExec.Command;
 
@@ -22,7 +23,7 @@ private static class Targets
             public const string SignPackage = "sign-package";
         }
 
-        internal static void Main(string[] args)
+        internal static async Task Main(string[] args)
         {
             Target(Targets.RestoreTools, () =>
             {
@@ -34,17 +35,17 @@ internal static void Main(string[] args)
                 Run("dotnet", "clean -c Release -v m --nologo");
             });
 
-            Target(Targets.Build, DependsOn(Targets.CleanBuildOutput), () =>
+            Target(Targets.Build, dependsOn: [Targets.CleanBuildOutput], () =>
             {
                 Run("dotnet", "build -c Release --nologo");
             });
 
-            Target(Targets.SignBinary, DependsOn(Targets.Build, Targets.RestoreTools), () =>
+            Target(Targets.SignBinary, dependsOn: [Targets.Build, Targets.RestoreTools], () =>
             {
                 Sign("./src/bin/Release", "IdentityServer4.AccessTokenValidation.dll");
             });
 
-            Target(Targets.Test, DependsOn(Targets.Build), () =>
+            Target(Targets.Test, dependsOn: [Targets.Build], () =>
             {
                 Run("dotnet", "test -c Release --no-build --nologo");
             });
@@ -57,21 +58,21 @@ internal static void Main(string[] args)
                 }
             });
 
-            Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>
+            Target(Targets.Pack, dependsOn: [Targets.Build, Targets.CleanPackOutput], () =>
             {
                 Run("dotnet", $"pack ./src/IdentityServer4.AccessTokenValidation.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
             });
 
-            Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>
+            Target(Targets.SignPackage, dependsOn: [Targets.Pack, Targets.RestoreTools], () =>
             {
                 Sign(packOutput, "*.nupkg");
             });
 
-            Target("default", DependsOn(Targets.Test, Targets.Pack));
+            Target("default", dependsOn: [Targets.Test, Targets.Pack]);
 
-            Target("sign", DependsOn(Targets.SignBinary, Targets.Test, Targets.SignPackage));
+            Target("sign", dependsOn: [Targets.SignBinary, Targets.Test, Targets.SignPackage]);
 
-            RunTargetsAndExit(args, ex => ex is SimpleExec.NonZeroExitCodeException || ex.Message.EndsWith(envVarMissing));
+            await RunTargetsAndExitAsync(args, ex => ex is SimpleExec.ExitCodeException || ex.Message.EndsWith(envVarMissing));
         }
 
         private static void Sign(string path, string searchTerm)
diff --git a/build/build.csproj b/build/build.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bullseye" Version="3.3.0" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.4" />
-    <PackageReference Include="SimpleExec" Version="6.2.0" />
+    <PackageReference Include="Bullseye" Version="6.0.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageReference Include="SimpleExec" Version="12.0.0" />
   </ItemGroup>
   
 </Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100"
+    "version": "9.0.203",
+    "rollForward": "latestFeature"
   }
 }
diff --git a/src/AuthorizationPolicyExtensions.cs b/src/AuthorizationPolicyExtensions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using IdentityModel;
+using Duende.IdentityModel;
 
 namespace Microsoft.AspNetCore.Authorization
 {
diff --git a/src/ConfigureInternalOptions.cs b/src/ConfigureInternalOptions.cs
@@ -7,7 +7,7 @@
 
 namespace IdentityServer4.AccessTokenValidation
 {
-    internal class ConfigureInternalOptions : 
+    internal class ConfigureInternalOptions :
         IConfigureNamedOptions<JwtBearerOptions>,
         IConfigureNamedOptions<OAuth2IntrospectionOptions>
     {
diff --git a/src/IdentityServer4.AccessTokenValidation.csproj b/src/IdentityServer4.AccessTokenValidation.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <Description>ASP.NET Core authentication handler to validate JWT and reference tokens from IdentityServer4</Description>
     <Authors>Brock Allen;Dominick Baier</Authors>
@@ -13,11 +13,11 @@
     <PackageProjectUrl>https://github.com/cnblogs/IdentityServer4.AccessTokenValidation</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageReleaseNotes>https://github.com/cnblogs/IdentityServer4.AccessTokenValidation/releases</PackageReleaseNotes>
-    
+
     <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    
+
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -31,14 +31,14 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="6.0.0" />
-    <PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.1.0" />
-    
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    
-    <PackageReference Include="minver" Version="4.2.0" PrivateAssets="All" />
+    <PackageReference Include="Duende.IdentityModel" Version="7.0.0" />
+    <PackageReference Include="Cnblogs.IdentityModel.AspNetCore.OAuth2Introspection" Version="7.0.0" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+
+    <PackageReference Include="minver" Version="6.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/IdentityServerAuthenticationExtensions.cs b/src/IdentityServerAuthenticationExtensions.cs
@@ -1,13 +1,13 @@
 ﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using System;
 using IdentityModel.AspNetCore.OAuth2Introspection;
 using IdentityServer4.AccessTokenValidation;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using System;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -59,13 +59,13 @@ public static AuthenticationBuilder AddIdentityServerAuthentication(this Authent
                 var monitor = services.GetRequiredService<IOptionsMonitor<IdentityServerAuthenticationOptions>>();
                 return new ConfigureInternalOptions(monitor.Get(authenticationScheme), authenticationScheme);
             });
-            
+
             builder.Services.AddSingleton<IConfigureOptions<OAuth2IntrospectionOptions>>(services =>
             {
                 var monitor = services.GetRequiredService<IOptionsMonitor<IdentityServerAuthenticationOptions>>();
                 return new ConfigureInternalOptions(monitor.Get(authenticationScheme), authenticationScheme);
             });
-            
+
             return builder.AddScheme<IdentityServerAuthenticationOptions, IdentityServerAuthenticationHandler>(authenticationScheme, configureOptions);
         }
 
@@ -77,7 +77,7 @@ public static AuthenticationBuilder AddIdentityServerAuthentication(this Authent
         /// <param name="jwtBearerOptions">The JWT bearer options.</param>
         /// <param name="introspectionOptions">The introspection options.</param>
         /// <returns></returns>
-        public static AuthenticationBuilder AddIdentityServerAuthentication(this AuthenticationBuilder builder, string authenticationScheme, 
+        public static AuthenticationBuilder AddIdentityServerAuthentication(this AuthenticationBuilder builder, string authenticationScheme,
             Action<JwtBearerOptions> jwtBearerOptions,
             Action<OAuth2IntrospectionOptions> introspectionOptions)
         {
diff --git a/src/IdentityServerAuthenticationOptions.cs b/src/IdentityServerAuthenticationOptions.cs
@@ -1,15 +1,14 @@
 ﻿// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using Duende.IdentityModel.Client;
 using IdentityModel.AspNetCore.OAuth2Introspection;
-using IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IdentityModel.Protocols;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.Net.Http;
 
diff --git a/test/Tests.csproj b/test/Tests.csproj
@@ -1,15 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="8.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/TokenValidationTests.cs b/test/TokenValidationTests.cs
@@ -1,5 +1,5 @@
+using Duende.IdentityModel.Client;
 using FluentAssertions;
-using IdentityModel.Client;
 using System.Net;
 using System.Threading.Tasks;
 using Tests.Util;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Threading.Tasks;`
`3`	`4`	`using static Bullseye.Targets;`
`4`	`5`	`using static SimpleExec.Command;`
`5`	`6`
`@@ -22,7 +23,7 @@ private static class Targets`
`22`	`23`	`public const string SignPackage = "sign-package";`
`23`	`24`	`}`
`24`	`25`
`25`		`- internal static void Main(string[] args)`
	`26`	`+ internal static async Task Main(string[] args)`
`26`	`27`	`{`
`27`	`28`	`Target(Targets.RestoreTools, () =>`
`28`	`29`	`{`
`@@ -34,17 +35,17 @@ internal static void Main(string[] args)`
`34`	`35`	`Run("dotnet", "clean -c Release -v m --nologo");`
`35`	`36`	`});`
`36`	`37`
`37`		`- Target(Targets.Build, DependsOn(Targets.CleanBuildOutput), () =>`
	`38`	`+ Target(Targets.Build, dependsOn: [Targets.CleanBuildOutput], () =>`
`38`	`39`	`{`
`39`	`40`	`Run("dotnet", "build -c Release --nologo");`
`40`	`41`	`});`
`41`	`42`
`42`		`- Target(Targets.SignBinary, DependsOn(Targets.Build, Targets.RestoreTools), () =>`
	`43`	`+ Target(Targets.SignBinary, dependsOn: [Targets.Build, Targets.RestoreTools], () =>`
`43`	`44`	`{`
`44`	`45`	`Sign("./src/bin/Release", "IdentityServer4.AccessTokenValidation.dll");`
`45`	`46`	`});`
`46`	`47`
`47`		`- Target(Targets.Test, DependsOn(Targets.Build), () =>`
	`48`	`+ Target(Targets.Test, dependsOn: [Targets.Build], () =>`
`48`	`49`	`{`
`49`	`50`	`Run("dotnet", "test -c Release --no-build --nologo");`
`50`	`51`	`});`
`@@ -57,21 +58,21 @@ internal static void Main(string[] args)`
`57`	`58`	`}`
`58`	`59`	`});`
`59`	`60`
`60`		`- Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>`
	`61`	`+ Target(Targets.Pack, dependsOn: [Targets.Build, Targets.CleanPackOutput], () =>`
`61`	`62`	`{`
`62`	`63`	`Run("dotnet", $"pack ./src/IdentityServer4.AccessTokenValidation.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");`
`63`	`64`	`});`
`64`	`65`
`65`		`- Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>`
	`66`	`+ Target(Targets.SignPackage, dependsOn: [Targets.Pack, Targets.RestoreTools], () =>`
`66`	`67`	`{`
`67`	`68`	`Sign(packOutput, "*.nupkg");`
`68`	`69`	`});`
`69`	`70`
`70`		`- Target("default", DependsOn(Targets.Test, Targets.Pack));`
	`71`	`+ Target("default", dependsOn: [Targets.Test, Targets.Pack]);`
`71`	`72`
`72`		`- Target("sign", DependsOn(Targets.SignBinary, Targets.Test, Targets.SignPackage));`
	`73`	`+ Target("sign", dependsOn: [Targets.SignBinary, Targets.Test, Targets.SignPackage]);`
`73`	`74`
`74`		`- RunTargetsAndExit(args, ex => ex is SimpleExec.NonZeroExitCodeException \|\| ex.Message.EndsWith(envVarMissing));`
	`75`	`+ await RunTargetsAndExitAsync(args, ex => ex is SimpleExec.ExitCodeException \|\| ex.Message.EndsWith(envVarMissing));`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`private static void Sign(string path, string searchTerm)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.100"`
	`3`	`+ "version": "9.0.203",`
	`4`	`+ "rollForward": "latestFeature"`
`4`	`5`	`}`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.`
`3`	`3`
`4`		`-using IdentityModel;`
	`4`	`+using Duende.IdentityModel;`
`5`	`5`
`6`	`6`	`namespace Microsoft.AspNetCore.Authorization`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace IdentityServer4.AccessTokenValidation`
`9`	`9`	`{`
`10`		`- internal class ConfigureInternalOptions :`
	`10`	`+ internal class ConfigureInternalOptions :`
`11`	`11`	`IConfigureNamedOptions<JwtBearerOptions>,`
`12`	`12`	`IConfigureNamedOptions<OAuth2IntrospectionOptions>`
`13`	`13`	`{`