chore: add tfm net10.0

Author: stratosblue

.github/workflows/PublishNugetPackage.yml

@@ -10,21 +10,34 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    permissions:
+      id-token: write
+
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          8.0.x
+          8.x
           9.x
+          10.x
     - name: restore dependencies
       run: dotnet restore
     - name: build
-      run: dotnet build --no-restore -c Release ./src/Cuture.AspNetCore.ResponseAutoWrapper/Cuture.AspNetCore.ResponseAutoWrapper.csproj
+      run: dotnet build --no-restore -c Release
+    - name: test
+      run: dotnet test --no-restore -c Release
     - name: pack
       run: dotnet pack -c Release -o ./output --include-symbols
+
+    - name: NuGet login
+      uses: NuGet/login@v1
+      id: login
+      with:
+        user: ${{ secrets.NUGET_USER }}
+
     - name: push package
       shell: pwsh
       working-directory: ./output
-      run: Get-ChildItem -File -Filter '*.nupkg' | ForEach-Object { dotnet nuget push $_ -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --no-service-endpoint --skip-duplicate; dotnet nuget push $_ -k ${{secrets.NUGET_GITHUB_KEY}} -s https://nuget.pkg.github.com/StratosBlue/index.json --no-service-endpoint --skip-duplicate; }
+      run: Get-ChildItem -File -Filter '*.nupkg' | ForEach-Object { dotnet nuget push $_ -k ${{steps.login.outputs.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --no-service-endpoint --skip-duplicate; dotnet nuget push $_ -k ${{secrets.NUGET_GITHUB_KEY}} -s https://nuget.pkg.github.com/StratosBlue/index.json --no-service-endpoint --skip-duplicate; }

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

LICENSE

@@ -1,6 +1,6 @@
-MIT License
+MIT License
 
-Copyright (c) 2021 Stratos
+Copyright (c) 2026 Stratos
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

global.json

@@ -1,5 +1,8 @@
-{
+{
   "msbuild-sdks": {
-    "MSTest.Sdk": "3.8.3"
+    "MSTest.Sdk": "4.0.2"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }

sample/CustomStructureWebApplication/CustomStructureWebApplication.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
 
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.*" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
+    <PackageReference Include="SwaggerUI.AspNetCore" Version="5.30.2" />
   </ItemGroup>
 
   <ItemGroup>

sample/CustomStructureWebApplication/Program.cs

@@ -1,23 +1,46 @@
-using Microsoft.AspNetCore.Hosting;
+using System.Diagnostics;
+using CustomStructureWebApplication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace CustomStructureWebApplication;
+var builder = WebApplication.CreateBuilder(args);
 
-public class Program
-{
-    #region Public 方法
+builder.Services.AddControllers();
+builder.Services.AddOpenApi();
+
+builder.Services.AddResponseAutoWrapper<CommonResponse<object>, string, RichMessage>()
+                .ConfigureWrappers(options => options.AddWrappers<CustomWrapper>());
 
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
+var app = builder.Build();
 
-    public static void Main(string[] args)
+app.Use(async (context, next) =>
+{
+    using var activity = new Activity("request");
+    Activity.Current = activity;
+    activity.Start();
+    try
     {
-        CreateHostBuilder(args).Build().Run();
+        await next();
     }
+    finally
+    {
+        activity.Stop();
+    }
+});
+
+app.UseResponseAutoWrapper();
 
-    #endregion Public 方法
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+    app.MapSwaggerUI();
 }
+
+app.UseRouting();
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

sample/CustomStructureWebApplication/Properties/launchSettings.json

@@ -2,10 +2,10 @@
   "profiles": {
     "CustomStructureWebApplication": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:5183",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

sample/CustomStructureWebApplication/Startup.cs

@@ -1,23 +1,44 @@
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace SimpleWebApplication;
+var builder = WebApplication.CreateBuilder(args);
 
-public class Program
+builder.Services.AddControllers();
+builder.Services.AddOpenApi();
+
+//自动包装ActionResult
+builder.Services.AddResponseAutoWrapper(options =>
 {
-    #region Public 方法
+    //配置
+    //options.ActionNoWrapPredicate     //Action的筛选委托，默认会过滤掉标记了NoResponseWrapAttribute的方法
+    //options.DisableOpenAPISupport     //禁用OpenAPI支持，Swagger将不会显示包装后的格式，也会解除响应类型必须为object泛型的限制
+    //options.HandleAuthorizationResult     //处理授权结果（可能无效，需要自行测试）
+    //options.HandleInvalidModelState       //处理无效模型状态
+    //options.RewriteStatusCode = null;     //包装时不覆写非200的HTTP状态码
+});
 
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
+var app = builder.Build();
 
-    public static void Main(string[] args)
-    {
-        CreateHostBuilder(args).Build().Run();
-    }
+//捕获异常、非200状态码的请求，包装响应
+app.UseResponseAutoWrapper(options =>
+{
+    //配置
+    //options.CatchExceptions 是否捕获异常
+    //options.ThrowCaughtExceptions 捕获到异常处理结束后，是否再将异常抛出
+    //options.DefaultOutputFormatterSelector 默认输出格式化器选择委托，选择在请求中无 Accept 时，用于格式化响应的 IOutputFormatter
+});
 
-    #endregion Public 方法
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+    app.MapSwaggerUI();
 }
+
+app.UseRouting();
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

sample/SimpleWebApplication/Program.cs

@@ -2,10 +2,10 @@
   "profiles": {
     "SimpleWebApplication": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:5216",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }