Merge pull request #1 from cnblogs/update-to-net9

cnblogs-dudu · web-flow · commit 68b573aed04f · 2025-05-04T18:08:35.000+08:00
chore(deps): update to .net 9
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,8 +25,7 @@ jobs:
       uses: actions/setup-dotnet@v2
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
+          9.0.x
 
     - run: dotnet --info
     
@@ -38,5 +37,4 @@ jobs:
       env:
         SignClientSecret: ${{ secrets.SIGNCLIENTSECRET }}
       run: |
-        ./build.cmd sign
-        dotnet nuget push .\artifacts\*.nupkg -s https://www.myget.org/F/identity/api/v2/package -k ${{ secrets.MYGET }}
+        ./build.cmd sign
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,12 +35,12 @@ 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.Test, DependsOn(Targets.Build), () =>
+            Target(Targets.Test, dependsOn: [Targets.Build], () =>
             {
                 Run("dotnet", "test -c Release --no-build --nologo");
             });
@@ -52,21 +53,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/IdentityModel.AspNetCore.OAuth2Introspection.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], () =>
             {
                 SignNuGet();
             });
 
-            Target("default", DependsOn(Targets.Test, Targets.Pack));
+            Target("default", dependsOn: [Targets.Test, Targets.Pack]);
 
-            Target("sign", DependsOn(Targets.Test, Targets.SignPackage));
+            Target("sign", dependsOn: [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 SignNuGet()
@@ -92,7 +93,7 @@ private static void SignNuGet()
                         "--azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 " +
                         $"--azure-key-vault-client-secret {signClientSecret} " +
                         "--azure-key-vault-certificate CodeSigning"
-                        ,noEcho: true);
+                        , noEcho: true);
             }
         }
     }
diff --git a/build/build.csproj b/build/build.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bullseye" Version="3.3.0" />
-    <PackageReference Include="SimpleExec" Version="6.2.0" />
+    <PackageReference Include="Bullseye" Version="6.0.0" />
+    <PackageReference Include="SimpleExec" Version="12.0.0" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "9.0.203",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
diff --git a/src/IdentityModel.AspNetCore.OAuth2Introspection.csproj b/src/IdentityModel.AspNetCore.OAuth2Introspection.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
     <PackageId>IdentityModel.AspNetCore.OAuth2Introspection</PackageId>
     <Description>ASP.NET Core authentication handler for validating tokens using OAuth 2.0 introspection</Description>
@@ -11,7 +11,7 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="IdentityModel" Version="6.0.0" />
 
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="minver" Version="4.3.0" PrivateAssets="All" />
+    <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/OAuth2IntrospectionHandler.cs b/src/OAuth2IntrospectionHandler.cs
@@ -1,19 +1,19 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using IdentityModel.Client;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using IdentityModel.Client;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace IdentityModel.AspNetCore.OAuth2Introspection
 {
@@ -33,16 +33,14 @@ public class OAuth2IntrospectionHandler : AuthenticationHandler<OAuth2Introspect
         /// </summary>
         /// <param name="options">The options.</param>
         /// <param name="urlEncoder">The URL encoder.</param>
-        /// <param name="clock">The clock.</param>
         /// <param name="loggerFactory">The logger factory.</param>
         /// <param name="cache">The cache.</param>
         public OAuth2IntrospectionHandler(
             IOptionsMonitor<OAuth2IntrospectionOptions> options,
             UrlEncoder urlEncoder,
-            ISystemClock clock,
             ILoggerFactory loggerFactory,
             IDistributedCache cache = null)
-            : base(options, loggerFactory, urlEncoder, clock)
+            : base(options, loggerFactory, urlEncoder)
         {
             _logger = loggerFactory.CreateLogger<OAuth2IntrospectionHandler>();
             _cache = cache;
@@ -154,10 +152,10 @@ await _cache.SetClaimsAsync(Options, token, claimsWithExp, Options.CacheDuration
         }
 
         private static async Task<AuthenticateResult> ReportNonSuccessAndReturn(
-            string error, 
-            HttpContext httpContext, 
-            AuthenticationScheme scheme, 
-            OAuth2IntrospectionEvents events, 
+            string error,
+            HttpContext httpContext,
+            AuthenticationScheme scheme,
+            OAuth2IntrospectionEvents events,
             OAuth2IntrospectionOptions options)
         {
             var authenticationFailedContext = new AuthenticationFailedContext(httpContext, scheme, options)
@@ -171,11 +169,11 @@ private static async Task<AuthenticateResult> ReportNonSuccessAndReturn(
         }
 
         private static async Task<TokenIntrospectionResponse> LoadClaimsForToken(
-	        string token, 
-	        HttpContext context, 
-	        AuthenticationScheme scheme, 
-	        OAuth2IntrospectionEvents events, 
-	        OAuth2IntrospectionOptions options)
+            string token,
+            HttpContext context,
+            AuthenticationScheme scheme,
+            OAuth2IntrospectionEvents events,
+            OAuth2IntrospectionOptions options)
         {
             var introspectionClient = await options.IntrospectionClient.Value.ConfigureAwait(false);
             using var request = CreateTokenIntrospectionRequest(token, context, scheme, events, options);
@@ -191,10 +189,10 @@ private static async Task<TokenIntrospectionResponse> LoadClaimsForToken(
         }
 
         private static TokenIntrospectionRequest CreateTokenIntrospectionRequest(
-	        string token,
-	        HttpContext context,
-	        AuthenticationScheme scheme,
-	        OAuth2IntrospectionEvents events,
+            string token,
+            HttpContext context,
+            AuthenticationScheme scheme,
+            OAuth2IntrospectionEvents events,
             OAuth2IntrospectionOptions options)
         {
             if (options.ClientSecret == null && options.ClientAssertionExpirationTime <= DateTime.UtcNow)
@@ -231,10 +229,10 @@ private static TokenIntrospectionRequest CreateTokenIntrospectionRequest(
         }
 
         private static async Task<AuthenticateResult> CreateTicket(
-            IEnumerable<Claim> claims, 
-            string token, 
-            HttpContext httpContext, 
-            AuthenticationScheme scheme, 
+            IEnumerable<Claim> claims,
+            string token,
+            HttpContext httpContext,
+            AuthenticationScheme scheme,
             OAuth2IntrospectionEvents events,
             OAuth2IntrospectionOptions options)
         {
diff --git a/test/Tests/Introspection.cs b/test/Tests/Introspection.cs
@@ -20,7 +20,6 @@ namespace Tests
 {
     public class Introspection
     {
-
         private static readonly string clientId = "client";
         private static readonly string clientSecret = "secret";
 
diff --git a/test/Tests/Tests.csproj b/test/Tests/Tests.csproj
@@ -1,31 +1,23 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-  
+
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\IdentityModel.AspNetCore.OAuth2Introspection.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    
-    
-  </ItemGroup>
-  
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.4" />
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
   </ItemGroup>
-  
-  
+
+
 </Project>

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,12 +35,12 @@ 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.Test, DependsOn(Targets.Build), () =>`
	`43`	`+ Target(Targets.Test, dependsOn: [Targets.Build], () =>`
`43`	`44`	`{`
`44`	`45`	`Run("dotnet", "test -c Release --no-build --nologo");`
`45`	`46`	`});`
`@@ -52,21 +53,21 @@ internal static void Main(string[] args)`
`52`	`53`	`}`
`53`	`54`	`});`
`54`	`55`
`55`		`- Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>`
	`56`	`+ Target(Targets.Pack, dependsOn: [Targets.Build, Targets.CleanPackOutput], () =>`
`56`	`57`	`{`
`57`	`58`	`Run("dotnet", $"pack ./src/IdentityModel.AspNetCore.OAuth2Introspection.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");`
`58`	`59`	`});`
`59`	`60`
`60`		`- Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>`
	`61`	`+ Target(Targets.SignPackage, dependsOn: [Targets.Pack, Targets.RestoreTools], () =>`
`61`	`62`	`{`
`62`	`63`	`SignNuGet();`
`63`	`64`	`});`
`64`	`65`
`65`		`- Target("default", DependsOn(Targets.Test, Targets.Pack));`
	`66`	`+ Target("default", dependsOn: [Targets.Test, Targets.Pack]);`
`66`	`67`
`67`		`- Target("sign", DependsOn(Targets.Test, Targets.SignPackage));`
	`68`	`+ Target("sign", dependsOn: [Targets.Test, Targets.SignPackage]);`
`68`	`69`
`69`		`- RunTargetsAndExit(args, ex => ex is SimpleExec.NonZeroExitCodeException \|\| ex.Message.EndsWith(envVarMissing));`
	`70`	`+ await RunTargetsAndExitAsync(args, ex => ex is SimpleExec.ExitCodeException \|\| ex.Message.EndsWith(envVarMissing));`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`private static void SignNuGet()`
`@@ -92,7 +93,7 @@ private static void SignNuGet()`
`92`	`93`	`"--azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 " +`
`93`	`94`	`$"--azure-key-vault-client-secret {signClientSecret} " +`
`94`	`95`	`"--azure-key-vault-certificate CodeSigning"`
`95`		`- ,noEcho: true);`
	`96`	`+ , noEcho: true);`
`96`	`97`	`}`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.100",`
	`3`	`+ "version": "9.0.203",`
`4`	`4`	`"rollForward": "latestMajor",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ namespace Tests`
`20`	`20`	`{`
`21`	`21`	`public class Introspection`
`22`	`22`	`{`
`23`		`-`
`24`	`23`	`private static readonly string clientId = "client";`
`25`	`24`	`private static readonly string clientSecret = "secret";`
`26`	`25`