😊 发布 v4.9.7.211 版本,修复组件出现循环依赖的错误检测问题 #ID7RT5 #ID4Y23 #ID1EJM #ICZN2F #ICH2ZO #ICEOD1

This commit is contained in:
MonkSoul
2025-11-22 18:08:43 +08:00
parent d2c33f5a08
commit 5541ba055f
40 changed files with 72 additions and 71 deletions

View File

@@ -13,7 +13,8 @@ body:
label:
description: 使 Furion
options:
- 4.9.7.210 ()
- 4.9.7.211 ()
- 4.9.7.210
-
validations:
required: true

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<LangVersion>preview</LangVersion>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Version>4.9.7.210</Version>
<Version>4.9.7.211</Version>
<ImplicitUsings>enable</ImplicitUsings>
<!--<Nullable>enable</Nullable>-->
<Authors>百小僧</Authors>

View File

@@ -146,7 +146,7 @@ internal static class Penetrates
}
else
{
// 链接组件:添加到末尾(保持原始逻辑)
// 链接组件:添加到末尾
if (!DependLinkList.Contains(componentType))
{
DependLinkList.Add(componentType);
@@ -199,7 +199,7 @@ internal static class Penetrates
calledContext.LinkComponents = linkComponents;
// 处理依赖组件
for (int i = 0; i < dependComponents.Length; i++)
for (var i = 0; i < dependComponents.Length; i++)
{
var dependComponent = dependComponents[i];
if (dependComponent == null) continue;
@@ -232,7 +232,7 @@ internal static class Penetrates
ResolveComponentDependencies(dependComponent, ref state, options);
}
// 保持原始的链接组件处理逻辑
// 链接组件处理逻辑
if (linkComponents == null || linkComponents.Length == 0) return;
foreach (var linkComponent in linkComponents)
@@ -251,7 +251,7 @@ internal static class Penetrates
throw new InvalidOperationException($"Circular dependency detected in links between {componentType.Name} and {linkComponent.Name}");
}
// 保持原始逻辑:只是递归处理链接组件
// 递归处理链接组件
if (!state.ProcessedComponents.Contains(linkComponent))
{
state.AddComponent(linkComponent, componentType, false);

View File

@@ -146,7 +146,7 @@ internal static class Penetrates
}
else
{
// 链接组件:添加到末尾(保持原始逻辑)
// 链接组件:添加到末尾
if (!DependLinkList.Contains(componentType))
{
DependLinkList.Add(componentType);
@@ -199,7 +199,7 @@ internal static class Penetrates
calledContext.LinkComponents = linkComponents;
// 处理依赖组件
for (int i = 0; i < dependComponents.Length; i++)
for (var i = 0; i < dependComponents.Length; i++)
{
var dependComponent = dependComponents[i];
if (dependComponent == null) continue;
@@ -232,7 +232,7 @@ internal static class Penetrates
ResolveComponentDependencies(dependComponent, ref state, options);
}
// 保持原始的链接组件处理逻辑
// 链接组件处理逻辑
if (linkComponents == null || linkComponents.Length == 0) return;
foreach (var linkComponent in linkComponents)
@@ -251,7 +251,7 @@ internal static class Penetrates
throw new InvalidOperationException($"Circular dependency detected in links between {componentType.Name} and {linkComponent.Name}");
}
// 保持原始逻辑:只是递归处理链接组件
// 递归处理链接组件
if (!state.ProcessedComponents.Contains(linkComponent))
{
state.AddComponent(linkComponent, componentType, false);

View File

@@ -11,8 +11,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
<ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.Api</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Api 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.App</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Mvc/Api 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.Blazor.App</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Blazor App 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.Blazor</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Blazor 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.BlazorWithWebApi</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Blazor和WebApi 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.Mvc</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Mvc 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.Razor</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 Razor Pages 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.Template.RazorWithWebApi</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 框架快速搭建 RazorPages和WebApi 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.Api</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Api 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.App</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Mvc/Api 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.Blazor.App</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Blazor App 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.Blazor</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Blazor 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.BlazorWithWebApi</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Blazor和WebApi 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.Mvc</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Mvc 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.Razor</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 Razor Pages 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Furion.SqlSugar.Template.RazorWithWebApi</id>
<version>4.9.7.210</version>
<version>4.9.7.211</version>
<description>基于 Furion 和 SqlSugar 框架快速搭建 RazorPages和WebApi 多层架构模板。</description>
<authors>百小僧</authors>
<packageTypes>

View File

@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.210" />
<PackageReference Include="Furion.Pure" Version="4.9.7.210" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.211" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.211" />
<PackageReference Include="Furion.Pure" Version="4.9.7.211" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<LangVersion>preview</LangVersion>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Version>4.9.7.210</Version>
<Version>4.9.7.211</Version>
<ImplicitUsings>enable</ImplicitUsings>
<!--<Nullable>enable</Nullable>-->
<Authors>百小僧</Authors>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Tools.CommandLine" Version="4.9.7.210" />
<PackageReference Include="Furion.Tools.CommandLine" Version="4.9.7.211" />
</ItemGroup>
</Project>

View File

@@ -96,7 +96,7 @@ function AddXmlCommentsToProperties($content, $commentsDictionary) {
return $modifiedContent
}
$FurTools = "Furion Tools v4.9.7.210";
$FurTools = "Furion Tools v4.9.7.211";
#
$copyright = @"