🎉🎉🎉 升级 .NET 10

Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile></DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile></DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -19,9 +19,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.2.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.137" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.137" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.137" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.200" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.200" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.200" />
     <PackageReference Include="Hardware.Info" Version="101.1.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -62,15 +62,15 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.21" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.12" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.4.1" />
-    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.4.1" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.10" />
+	
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="10.0.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="10.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
     <PackageReference Include="XiHan.Framework.Utils" Version="1.4.3" />
-  </ItemGroup>
+  </ItemGroup>	
 
 </Project>

Admin.NET/Admin.NET.Core/Service/File/SysFileProviderService.cs

@@ -5,8 +5,6 @@
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 using OnceMi.AspNetCore.OSS;
-using Newtonsoft.Json;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Admin.NET.Core.Service;
 
@@ -43,7 +41,7 @@ public class SysFileProviderService : IDynamicApiController, ITransient
     /// <returns></returns>
     [DisplayName("获取文件存储提供者分页列表")]
     [NonAction]
-    public async Task<SqlSugarPagedList<SysFileProvider>> GetFileProviderPage(PageFileProviderInput input)
+    public async Task<SqlSugarPagedList<SysFileProvider>> GetFileProviderPage([FromQuery] PageFileProviderInput input)
     {
         return await _sysFileProviderRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.Provider), u => u.Provider.Contains(input.Provider!))

Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs

@@ -4,13 +4,13 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-#if NET9_0_OR_GREATER
+#if NET10_0_OR_GREATER
 
 using XiHan.Framework.Utils.Core;
 using XiHan.Framework.Utils.Reflections;
 using ReflectionHelper = XiHan.Framework.Utils.Reflections.ReflectionHelper;
 
-#endif // NET9_0_OR_GREATER
+#endif // NET10_0_OR_GREATER
 
 namespace Admin.NET.Core.Service;
 
@@ -24,7 +24,7 @@ public class SysServerService : IDynamicApiController, ITransient
     {
     }
 
-#if NET9_0_OR_GREATER
+#if NET10_0_OR_GREATER
 
     /// <summary>
     /// 获取服务器硬件信息
@@ -59,7 +59,7 @@ public class SysServerService : IDynamicApiController, ITransient
         return nuGetPackages;
     }
 
-#endif // NET9_0_OR_GREATER
+#endif // NET10_0_OR_GREATER
 
     /// <summary>
     /// 获取服务器配置信息 🔖

Admin.NET/Admin.NET.Core/Update/AutoVersionUpdate.cs

@@ -4,7 +4,7 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-#if NET9_0_OR_GREATER
+#if NET10_0_OR_GREATER
 
 using Microsoft.AspNetCore.Builder;
 using XiHan.Framework.Utils.Logging;
@@ -237,4 +237,4 @@ public static class AutoVersionUpdate
 public record SqlFileInfo(string Version, string FilePath);
 public record HistoryVersionInfo(string Version, string Date, bool IsRunScript);
 
-#endif // NET9_0_OR_GREATER
+#endif // NET10_0_OR_GREATER

Admin.NET/Admin.NET.Core/Utils/TenantHeaderOperationFilter.cs

@@ -1,33 +1,33 @@
-using Admin.NET.Core;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using Admin.NET.Core;
+//using Microsoft.OpenApi.Models;
+//using Swashbuckle.AspNetCore.SwaggerGen;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
 
-namespace Admin.NET.Core;
+//namespace Admin.NET.Core;
 
-/// <summary>
-/// 租户头部参数过滤器
-/// </summary>
-public class TenantHeaderOperationFilter : IOperationFilter
-{
-    /// <summary>
-    /// 应用租户头部参数过滤器
-    /// </summary>
-    public void Apply(OpenApiOperation operation, OperationFilterContext context)
-    {
-        operation.Parameters ??= new List<OpenApiParameter>();
+///// <summary>
+///// 租户头部参数过滤器
+///// </summary>
+//public class TenantHeaderOperationFilter : IOperationFilter
+//{
+//    /// <summary>
+//    /// 应用租户头部参数过滤器
+//    /// </summary>
+//    public void Apply(OpenApiOperation operation, OperationFilterContext context)
+//    {
+//        operation.Parameters ??= new List<OpenApiParameter>();
 
-        operation.Parameters.Add(new OpenApiParameter
-        {
-            Name = ClaimConst.TenantId,
-            In = ParameterLocation.Header,
-            Required = false,
-            AllowEmptyValue = true,
-            Description = "租户ID（留空表示默认租户）"
-        });
-    }
-}
+//        operation.Parameters.Add(new OpenApiParameter
+//        {
+//            Name = ClaimConst.TenantId,
+//            In = ParameterLocation.Header,
+//            Required = false,
+//            AllowEmptyValue = true,
+//            Description = "租户ID（留空表示默认租户）"
+//        });
+//    }
+//}

Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile></DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.137" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.200" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Selenium.Support" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="141.0.3537.71" />

Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591</NoWarn>
     <DocumentationFile></DocumentationFile>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.10" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -32,7 +32,7 @@ using System.Text.Json;
 using System.Text.Unicode;
 using System.Threading.Tasks;
 
-#if NET9_0_OR_GREATER
+#if NET10_0_OR_GREATER
 using Admin.NET.Core.Update;
 #endif
 
@@ -221,25 +221,25 @@ public class Startup : AppStartup
         // 控制台logo
         services.AddConsoleLogo();
 
-        // Swagger 时间格式化
-        services.AddSwaggerGen(c =>
-        {
-            c.MapType<DateTime>(() => new Microsoft.OpenApi.Models.OpenApiSchema
-            {
-                Type = "string",
-                Format = "date-time",
-                Example = new Microsoft.OpenApi.Any.OpenApiString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")) // 示例值
-            });
-
-            // 确保生成的文档包含 OpenAPI 版本字段
-            c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo
-            {
-                Version = "v1",
-                Title = "Admin.NET API",
-                Description = "Admin.NET 通用权限开发平台"
-            });
-            c.OperationFilter<TenantHeaderOperationFilter>();
-        });
+        //// Swagger 时间格式化
+        //services.AddSwaggerGen(c =>
+        //{
+        //    c.MapType<DateTime>(() => new Microsoft.OpenApi.Models.OpenApiSchema
+        //    {
+        //        Type = "string",
+        //        Format = "date-time",
+        //        Example = new Microsoft.OpenApi.Any.OpenApiString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")) // 示例值
+        //    });
+
+        //    // 确保生成的文档包含 OpenAPI 版本字段
+        //    c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo
+        //    {
+        //        Version = "v1",
+        //        Title = "Admin.NET API",
+        //        Description = "Admin.NET 通用权限开发平台"
+        //    });
+        //    c.OperationFilter<TenantHeaderOperationFilter>();
+        //});
 
         // 将IP地址数据库文件完全加载到内存，提升查询速度（以空间换时间，内存将会增加60-70M）
         IpToolSettings.LoadInternationalDbToMemory = true;
@@ -384,7 +384,7 @@ public class Startup : AppStartup
             });
         });
 
-#if NET9_0_OR_GREATER
+#if NET10_0_OR_GREATER
         app.UseAutoVersionUpdate();
 #endif 
 

Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>

Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Admin.NET.Plugin.ApprovalFlow.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Admin.NET.Plugin.DingTalk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.GoView/Admin.NET.Plugin.GoView.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.K3Cloud/Admin.NET.Plugin.K3Cloud.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Admin.NET.Plugin.WorkWeixin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>

Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.11.08",
+	"lastBuildTime": "2025.11.12",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -89,8 +89,8 @@
 		"@types/node": "^22.19.0",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.9",
-		"@typescript-eslint/eslint-plugin": "^8.46.3",
-		"@typescript-eslint/parser": "^8.46.3",
+		"@typescript-eslint/eslint-plugin": "^8.46.4",
+		"@typescript-eslint/parser": "^8.46.4",
 		"@vitejs/plugin-vue": "^6.0.1",
 		"@vitejs/plugin-vue-jsx": "^5.1.1",
 		"@vue/compiler-sfc": "^3.5.24",
@@ -104,7 +104,7 @@
 		"less": "^4.4.2",
 		"prettier": "^3.6.2",
 		"rollup-plugin-visualizer": "^6.0.5",
-		"sass": "^1.93.3",
+		"sass": "^1.94.0",
 		"terser": "^5.44.1",
 		"typescript": "^5.9.3",
 		"vite": "^7.2.2",