tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 17:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3.2.664 #1155

Browse Source
This commit is contained in:
2881099
2022-06-14 09:32:42 +08:00
parent 5c427c0b6b
commit 5ac8b7dd7a
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Version>3.2.663</Version> <Version>3.2.664</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@@ -795,5 +795,14 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

8
FreeSql/Internal/CommonUtils.cs
View File

@@ -648,14 +648,18 @@ namespace FreeSql.Internal
{ {
var cbs = LocalGetComment(prop.DeclaringType, level + 1); var cbs = LocalGetComment(prop.DeclaringType, level + 1);
if (cbs != null && cbs.TryGetValue(prop.Name, out var otherComment) && string.IsNullOrEmpty(otherComment) == false) if (cbs != null && cbs.TryGetValue(prop.Name, out var otherComment) && string.IsNullOrEmpty(otherComment) == false)
dic.Add(prop.Name, otherComment); {
if (dic.ContainsKey(prop.Name)) dic[prop.Name] = otherComment;
else dic.Add(prop.Name, otherComment);
}
} }
continue; continue;
} }
var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t'); var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t');
if (string.IsNullOrEmpty(comment)) continue; if (string.IsNullOrEmpty(comment)) continue;
dic.Add(prop.Name, comment); if (dic.ContainsKey(prop.Name)) dic[prop.Name] = comment;
else dic.Add(prop.Name, comment);
} }
} }
} }