diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 36188f5f3e0fae6e6f3ca133eb9c5bd182fb22f4..b0cdb648e20d56b335736cdd1d625614d6dea7dd 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -13,7 +13,9 @@ body: label: 版本号 description: 请选择项目使用的 Furion 版本? options: - - 4.9.5.13 (最新) + - 4.9.5.15 (最新) + - 4.9.5.14 + - 4.9.5.13 - 4.9.5.12 - 4.9.5.11 - 4.9.5.10 diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index 9b210be5d6c169889b1436c5976d9852aba9ee81..c42a908521952f290749a82b8dd1734049c48b57 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.14 + 4.9.5.15 enable 百小僧 百签科技(广东)有限公司 diff --git a/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj b/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj index 8d7579b1c9548c3e4137838f16bb3b660e55f344..7faa35e7e131e7e0f601adee4f9e1ba963ecb5b1 100644 --- a/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj +++ b/framework/Furion.Extras.Logging.Serilog/Furion.Extras.Logging.Serilog.csproj @@ -16,12 +16,12 @@ - + - + diff --git a/framework/Furion.Pure/App/Native.cs b/framework/Furion.Pure/App/Native.cs index 30bd30315f1fe03484f881edaaa488196a55c2cd..947ff2b92f6cc882bc589aab0586b9b3397ff3ac 100644 --- a/framework/Furion.Pure/App/Native.cs +++ b/framework/Furion.Pure/App/Native.cs @@ -129,7 +129,7 @@ public static class Native return windowInstance; } - private static readonly object PortLock = new(); + private static readonly object _portLock = new(); /// /// 获取一个空闲端口 @@ -142,7 +142,7 @@ public static class Native do { - lock (PortLock) + lock (_portLock) { var randomPort = RandomNumberGenerator.GetInt32(fromPort, toPort + 1); if (!IsPortInUse(randomPort)) @@ -151,11 +151,16 @@ public static class Native } } - // 减少CPU资源消耗 + // 减少 CPU 资源消耗 Thread.Sleep(10); } while (true); } + /// + /// 检查端口是否被占用 + /// + /// + /// private static bool IsPortInUse(int port) { return IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners().Any(p => p.Port == port); diff --git a/framework/Furion.Pure/DynamicApiController/Internal/Penetrates.cs b/framework/Furion.Pure/DynamicApiController/Internal/Penetrates.cs index ffcfa609c8e318b22b34d1f007de003872dfd599..b9b547b1bdf34ca917316aeecc4b584bad56934e 100644 --- a/framework/Furion.Pure/DynamicApiController/Internal/Penetrates.cs +++ b/framework/Furion.Pure/DynamicApiController/Internal/Penetrates.cs @@ -114,10 +114,10 @@ internal static class Penetrates || (type.IsDefined(typeof(RouteAttribute), true))) { // 处理运行时动态生成程序集问题 - if (type.Assembly?.ManifestModule?.Name == "") return true; + // if (type.Assembly?.ManifestModule?.Name == "") return true; // 解决 ASP.NET Core 启动时自动载入 NuGet 包导致模块化配置 SupportPackageNamePrefixs 出现非预期的结果 - if (!App.EffectiveTypes.Any(t => t == type)) return false; + // if (!App.EffectiveTypes.Any(t => t == type)) return false; return true; } diff --git a/framework/Furion/DynamicApiController/Internal/Penetrates.cs b/framework/Furion/DynamicApiController/Internal/Penetrates.cs index ffcfa609c8e318b22b34d1f007de003872dfd599..b9b547b1bdf34ca917316aeecc4b584bad56934e 100644 --- a/framework/Furion/DynamicApiController/Internal/Penetrates.cs +++ b/framework/Furion/DynamicApiController/Internal/Penetrates.cs @@ -114,10 +114,10 @@ internal static class Penetrates || (type.IsDefined(typeof(RouteAttribute), true))) { // 处理运行时动态生成程序集问题 - if (type.Assembly?.ManifestModule?.Name == "") return true; + // if (type.Assembly?.ManifestModule?.Name == "") return true; // 解决 ASP.NET Core 启动时自动载入 NuGet 包导致模块化配置 SupportPackageNamePrefixs 出现非预期的结果 - if (!App.EffectiveTypes.Any(t => t == type)) return false; + // if (!App.EffectiveTypes.Any(t => t == type)) return false; return true; } diff --git a/samples/Furion.Application/TestRoute.cs b/samples/Furion.Application/TestRoute.cs new file mode 100644 index 0000000000000000000000000000000000000000..8cbc46385aead47b8fa3e14104834191ac5cb04e --- /dev/null +++ b/samples/Furion.Application/TestRoute.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Furion.Application +{ + [Route("IPad/[controller]")] + //[ApiDescriptionSettings(KeepName =true)] + public class TestRoute : IDynamicApiController + { + public string GetTest() + { + return "Hello"; + } + } + + public class MyClass : TestRoute + { + public string GetXXX() + { + return string.Empty; + } + } +} diff --git a/samples/Furion.Core/Furion.Core.csproj b/samples/Furion.Core/Furion.Core.csproj index b89ecb3dc76d2e70dd20b16d79e5610023b39cc3..78a91db459c383a0fab5f9c42528fef7fa499f42 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 d5f1add96f1e461458ed07d938996817457c48ea..2d45ee0f7a8dfe7c296b6e3ea4c4f59bb0a11bf3 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index de4fa3338f2fc2972c48ac0d9a9c39341b842db6..13921ea752cda1280e492a1ea287fb66230bb594 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 0b835fa72f6cb83ee58b7b0e241437033a7599da..4c4fc995f9f16e427c9ae071f52717881ee6a8ad 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index ceeaa22af84bea33082a39ff6a22f8245d024fae..e56c2f1fb3423e2cdd69d86adaa09efeac456e62 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 c9de741a024eb45107022bbfba2aaf95e4be6c3a..1a2b641469ad88f0913b90a4b35ea5e8243edbe3 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index d8ded4a74e11995ac09c42103d5104156b3c72a3..4d4bdb6ecb9e50af8bcfbb9146ba40eaadc9a58f 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 37f7bd009adc5cd93119680f72f129280c49e51b..a43bebbf8bc9b9c729a4820e9ab1daea038284c1 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 7d5c8ae466fdc3b56f32bc92d6307a10d97c0b3c..12f0098d6de54b55e93d3e7f8ef8bbad2cb504a2 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 ac629f87b783448e198e3c706aa119adb2f24ff0..c96e827c98cd63f96efa5c5e1140829f33686844 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 198d40d15b091e41f65ed1bf375dab3353caa790..8783a3d79c6982c308a3b03201fe3b56280348ad 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 779a35d10732b443d28c3d3fdc7300abd4627ae3..9b35a882ac04b899391ef1e645a5eb2c5d3bc134 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 7d5c8ae466fdc3b56f32bc92d6307a10d97c0b3c..12f0098d6de54b55e93d3e7f8ef8bbad2cb504a2 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 34867e92eb56bd479970f89c2e29fcde3a84bece..f34161669e138cc52a8f90858994b5b85d9d51cd 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 7d5c8ae466fdc3b56f32bc92d6307a10d97c0b3c..12f0098d6de54b55e93d3e7f8ef8bbad2cb504a2 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 ca51e26cdf9f67de36961f3eb016c298e5e15dc7..bcaa8a50fb4b1c5ce28f2bbd47be271247a8a125 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.14 + 4.9.5.15 基于 Furion 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 8b2673eddee60547c6fe00375d45b96451fe7231..7bfd422940a020e08dd9723c3904c2bf19cce0fb 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 27d94e5239cbd1d54f7167ba5d7c1e0b5fea164f..ebb077d1b187a132dd82dc219f02738513e5d22f 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.14 + 4.9.5.15 基于 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 77c3e921ca8614adfd5c8f42d937f8d42416a20c..09ced20d685e64134b96b14c89be6cd9600f4d68 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 3e56468ffd088452586a411d51885a5930a3b05c..5a653bec24a28166e0e45bf821bd58cda45bf5da 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.14 + 4.9.5.15 基于 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 619cb33f51ad57590087b69bb45f68a5f648a16a..b56627a31c3ec695347af4b3be996041482ec46d 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 b37589e1d6145fc24eabedf8ef045ab05b4f6672..1558349501bd6e14a6c3cca8b3c9497d846deeed 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.14 + 4.9.5.15 基于 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 a7b1b6516c8629e466226833b406d90cb2fecea6..a9ee31d855ab067bcaace21e4d1049d5d9646d2b 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 c5953fac069d78c67d15d3b4ebbfcb7c2c73cee9..dcc1d2eb60aa0119203b0b92b88cee942e54a59b 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.14 + 4.9.5.15 基于 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 3265ab5ef64716824926088d46c2b26657285d3d..3f89d84824d55d7459929854af9c2432c97d3f6c 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 1937fc6cd689cdc3c65ff9e323e7e4b7dbe6b974..edaa031590442eec326e4ad35318b9f0c08fa065 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.14 + 4.9.5.15 基于 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 276d470d35c134b348d5bb9f9c4d69bf068f9b8b..b6782b5da5d133ce6e2d536d948757f6ec5b8b12 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 0b4028f0a6a52d1c4704f553dfad2f75492b1ebc..e62cadabf7f653a933b6e3573f44e1b2d3dd811b 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.14 + 4.9.5.15 基于 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 3265ab5ef64716824926088d46c2b26657285d3d..3f89d84824d55d7459929854af9c2432c97d3f6c 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 1805e9797f4ba5343217dc8735ae9cbc6b1b5cf9..7682deabb114397fe80bf446727bdb5fb150b2c8 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.14 + 4.9.5.15 基于 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 3265ab5ef64716824926088d46c2b26657285d3d..3f89d84824d55d7459929854af9c2432c97d3f6c 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 a0eab66aa8e5462df28661f436f762f398cbcea4..8f22aa78a86fa9ac53548decc318b3d094c9da24 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.14 + 4.9.5.15 基于 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 00813e4e50af3afb4d666d8977fcbe4355f62a51..4de6913f118cf81da165f11ef1946e0d401a5816 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/tools/Furion.Tools/Directory.Build.props b/tools/Furion.Tools/Directory.Build.props index 8b8dd77cb256e0addaef9e1d6b6fdf25bf081dd1..559dc39c1fbea44b8afffa5201cbe4a3290e39a3 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.14 + 4.9.5.15 enable 百小僧 百签科技(广东)有限公司 diff --git a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj index 93d1d7e13926591ab7d0175c0ba02ee89b87060b..4628d7fb956b7e33d343681b0525f8a1bdb9b697 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 9ed230a877bbae45643a666ec8676d9f8e34dc62..46ae1e3c7fc1465cbe68b6cb5ac41229a6a0ccae 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.13"; +$FurTools = "Furion Tools v4.9.5.15"; # 输出信息 $copyright = @"