From e73c623634d9eb2744a6992872c54bde628e8673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Fri, 22 Nov 2024 14:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8A=20=E5=8F=91=E5=B8=83=20`v4.9.5.26`?= =?UTF-8?q?=20=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E7=89=88=E6=9C=AC=E5=BC=95=E8=B5=B7=E7=9A=84=20`Seria?= =?UTF-8?q?lizer=20options=20cannot=20be=20changed=20once=20serialization?= =?UTF-8?q?=20or=20deserialization=20has=20occurred.`=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE/bug.yml | 3 ++- framework/Directory.Build.props | 2 +- .../Authorization/Handlers/AppAuthorizeHandler.cs | 9 ++------- .../Furion/Authorization/Handlers/AppAuthorizeHandler.cs | 9 ++------- samples/Furion.Core/Furion.Core.csproj | 4 ++-- templates/FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- templates/FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- .../FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- .../FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- .../FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.SqlSugar.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- .../FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- .../FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- .../Furion.IntegrationTests.csproj | 2 +- tests/Furion.UnitTests/Furion.UnitTests.csproj | 2 +- tools/Furion.Tools/Directory.Build.props | 2 +- tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj | 2 +- tools/cli.ps1 | 2 +- 42 files changed, 70 insertions(+), 79 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 05c4e20062..4c9aa182d3 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -13,7 +13,8 @@ body: label: 版本号 description: 请选择项目使用的 Furion 版本？ options: - - 4.9.5.25 (最新) + - 4.9.5.26 (最新) + - 4.9.5.25 - 4.9.5.24 - 4.9.5.23 - 4.9.5.22 diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index c8b92cb70d..5c68b890c8 100644 --- a/framework/Directory.Build.props +++ b/framework/Directory.Build.props @@ -1,7 +1,7 @@ net6.0;net7.0;net8.0;net9.0 - 4.9.5.25 + 4.9.5.26 enable 百小僧 百签科技（广东）有限公司 diff --git a/framework/Furion.Pure/Authorization/Handlers/AppAuthorizeHandler.cs b/framework/Furion.Pure/Authorization/Handlers/AppAuthorizeHandler.cs index e78098b325..e12553a46a 100644 --- a/framework/Furion.Pure/Authorization/Handlers/AppAuthorizeHandler.cs +++ b/framework/Furion.Pure/Authorization/Handlers/AppAuthorizeHandler.cs @@ -28,7 +28,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using System.Text.Encodings.Web; namespace Furion.Authorization; @@ -169,14 +168,10 @@ private static async Task UnifyWrapper(DefaultHttpContext httpContext, Exception Exception = exception }), out var data); - // 终止返回 + // 设置响应状态码 httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError; - // 解决中文乱码问题 - var jsonSerializerOptions = App.GetOptions()?.JsonSerializerOptions ?? new(); - jsonSerializerOptions.Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping; - - await httpContext.Response.WriteAsJsonAsync(data, jsonSerializerOptions); + await httpContext.Response.WriteAsJsonAsync(data, App.GetOptions()?.JsonSerializerOptions); } else throw exception; } diff --git a/framework/Furion/Authorization/Handlers/AppAuthorizeHandler.cs b/framework/Furion/Authorization/Handlers/AppAuthorizeHandler.cs index e78098b325..e12553a46a 100644 --- a/framework/Furion/Authorization/Handlers/AppAuthorizeHandler.cs +++ b/framework/Furion/Authorization/Handlers/AppAuthorizeHandler.cs @@ -28,7 +28,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using System.Text.Encodings.Web; namespace Furion.Authorization; @@ -169,14 +168,10 @@ private static async Task UnifyWrapper(DefaultHttpContext httpContext, Exception Exception = exception }), out var data); - // 终止返回 + // 设置响应状态码 httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError; - // 解决中文乱码问题 - var jsonSerializerOptions = App.GetOptions()?.JsonSerializerOptions ?? new(); - jsonSerializerOptions.Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping; - - await httpContext.Response.WriteAsJsonAsync(data, jsonSerializerOptions); + await httpContext.Response.WriteAsJsonAsync(data, App.GetOptions()?.JsonSerializerOptions); } else throw exception; } diff --git a/samples/Furion.Core/Furion.Core.csproj b/samples/Furion.Core/Furion.Core.csproj index 35aeb1cabc..02ef6381a1 100644 --- a/samples/Furion.Core/Furion.Core.csproj +++ b/samples/Furion.Core/Furion.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/FurionApiTemplate/Furion.Template.Api.nuspec index 9007131d14..cccf9abd67 100644 --- a/templates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.Template.Api - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index eeba54483e..2bf90a993d 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/FurionAppTemplate/Furion.Template.App.nuspec index 15546f6455..23a4cc8ec3 100644 --- a/templates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.App - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index 1aa421679d..70865fc59f 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec index e99a2814b0..866a1b8ccc 100644 --- a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec +++ b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor.App - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index 7f8f7e081a..a8c98bb70e 100644 --- a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 91f662b774..0b51d960c7 100644 --- a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 9c13a3e3c8..6a21c1cb76 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index 531d4fc2c4..e22a679888 100644 --- a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.BlazorWithWebApi - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index aae0ab7749..601f17c64a 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index 06b285fb9a..dc36e257f3 100644 --- a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.Template.Mvc - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 9c13a3e3c8..6a21c1cb76 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec index 43ef7bc4bd..ffc36385da 100644 --- a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Razor - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 9c13a3e3c8..6a21c1cb76 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index 6369566db9..5da6bca370 100644 --- a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.RazorWithWebApi - 4.9.5.25 + 4.9.5.26 基于 Furion 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 1951a987a0..b380b20ff5 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec index 97bb0b1fe8..31ba8b00bc 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Api - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index d8cb29c509..6c65e9b2ef 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec index 6a95ec3c66..14cf65be56 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.App - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index 135dc267c3..07e539246f 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec index bdef4651c5..c8dbdd83bc 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor.App - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index b038fc60fc..0105385b07 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 0ee83a465f..9d3481eb4e 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index b1095e8623..fb8aec87dd 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index 582e304dc4..300ffe03ce 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.BlazorWithWebApi - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 598b6b5655..a12fafaf6d 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index 1627ea8e34..de2c55a485 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Mvc - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index b1095e8623..fb8aec87dd 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec index 39743176ed..9c620990f5 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Razor - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index b1095e8623..fb8aec87dd 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index c15038df15..9a0cdcc719 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.RazorWithWebApi - 4.9.5.25 + 4.9.5.26 基于 Furion 和 SqlSugar 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 94331a1d14..bd4a554646 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/tests/Furion.IntegrationTests/Furion.IntegrationTests.csproj b/tests/Furion.IntegrationTests/Furion.IntegrationTests.csproj index 3d7a165e09..08c21d3e8c 100644 --- a/tests/Furion.IntegrationTests/Furion.IntegrationTests.csproj +++ b/tests/Furion.IntegrationTests/Furion.IntegrationTests.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/Furion.UnitTests/Furion.UnitTests.csproj b/tests/Furion.UnitTests/Furion.UnitTests.csproj index 504ed8cd74..0bcc077779 100644 --- a/tests/Furion.UnitTests/Furion.UnitTests.csproj +++ b/tests/Furion.UnitTests/Furion.UnitTests.csproj @@ -7,7 +7,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tools/Furion.Tools/Directory.Build.props b/tools/Furion.Tools/Directory.Build.props index 968e182050..519e403860 100644 --- a/tools/Furion.Tools/Directory.Build.props +++ b/tools/Furion.Tools/Directory.Build.props @@ -1,7 +1,7 @@  net6.0;net7.0;net8.0;net9.0 - 4.9.5.25 + 4.9.5.26 enable 百小僧 百签科技（广东）有限公司 diff --git a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj index 416f8c7915..9d2a11197a 100644 --- a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj +++ b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/tools/cli.ps1 b/tools/cli.ps1 index aa7ef37f5f..2b0502f993 100644 --- a/tools/cli.ps1 +++ b/tools/cli.ps1 @@ -96,7 +96,7 @@ function AddXmlCommentsToProperties($content, $commentsDictionary) { return $modifiedContent } -$FurTools = "Furion Tools v4.9.5.25"; +$FurTools = "Furion Tools v4.9.5.26"; # 输出信息 $copyright = @"