Skip to content

Commit bc85b9c

Browse files
committed
- 修复 XML注释可能引起文件被锁报错的问题;
1 parent 8858262 commit bc85b9c

File tree

4 files changed

+143
-111
lines changed

4 files changed

+143
-111
lines changed

Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void LocalCompareEntityValueCollection(Type elementType, IEnumerable collectionB
162162
if (dictAfter.ContainsKey(key) == false)
163163
dictAfter.Add(key, item);
164164
else if (key == "0" && table.Primarys.Length == 1 &&
165-
new[] { typeof(long), typeof(long) }.Contains(table.Primarys[0].CsType))
165+
new[] { typeof(long), typeof(int) }.Contains(table.Primarys[0].CsType))
166166
tracking.InsertLog.Add(NativeTuple.Create(elementType, item));
167167
}
168168
else tracking.InsertLog.Add(NativeTuple.Create(elementType, item));

FreeSql.DbContext/FreeSql.DbContext.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FreeSql/FreeSql.xml

Lines changed: 124 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FreeSql/Internal/CommonUtils.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,15 @@ Dictionary<string, string> LocalGetComment(Type localType, int level)
686686
}
687687

688688
var dic = new Dictionary<string, string>();
689-
var sReader = new StringReader(File.ReadAllText(xmlPath));
689+
StringReader sReader = null;
690+
try
691+
{
692+
sReader = new StringReader(File.ReadAllText(xmlPath));
693+
}
694+
catch
695+
{
696+
return dic;
697+
}
690698
using (var xmlReader = XmlReader.Create(sReader))
691699
{
692700
XPathDocument xpath = null;

0 commit comments

Comments
 (0)