- 修复 XML注释可能引起文件被锁报错的问题；

dotnetcore · May 20, 2024 · bc85b9c · bc85b9c
1 parent 8858262
commit bc85b9c
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 111 deletions.
diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs b/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs
@@ -162,7 +162,7 @@ void LocalCompareEntityValueCollection(Type elementType, IEnumerable collectionB
                         if (dictAfter.ContainsKey(key) == false)
                             dictAfter.Add(key, item);
                         else if (key == "0" && table.Primarys.Length == 1 && 
-                            new[] { typeof(long), typeof(long) }.Contains(table.Primarys[0].CsType))
+                            new[] { typeof(long), typeof(int) }.Contains(table.Primarys[0].CsType))
                             tracking.InsertLog.Add(NativeTuple.Create(elementType, item));
                     }
                     else tracking.InsertLog.Add(NativeTuple.Create(elementType, item));

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonUtils.cs b/FreeSql/Internal/CommonUtils.cs
@@ -686,7 +686,15 @@ Dictionary<string, string> LocalGetComment(Type localType, int level)
                 }
 
                 var dic = new Dictionary<string, string>();
-                var sReader = new StringReader(File.ReadAllText(xmlPath));
+                StringReader sReader = null;
+                try
+                {
+                    sReader = new StringReader(File.ReadAllText(xmlPath));
+                }
+                catch
+                {
+                    return dic;
+                }
                 using (var xmlReader = XmlReader.Create(sReader))
                 {
                     XPathDocument xpath = null;