tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 04:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.0.0-preview1119 #542 #537

Browse Source
This commit is contained in:
2881099
2020-11-18 10:17:11 +08:00
parent 8fdcc3ac5c
commit 60682936fa
24 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql.DbContext/FreeSql.DbContext.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks>
<Version>2.0.0-preview1115</Version>
<Version>2.0.0-preview1119</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description>

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

@ -502,14 +502,5 @@
<param name="that"></param>
<returns></returns>
</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>
</doc>

8
FreeSql.DbContext/UnitOfWork/UnitOfWork.cs
View File

@ -111,9 +111,9 @@ namespace FreeSql
var isCommited = false;
try
{
if (_tran != null && _tran.Connection != null)
if (_tran != null)
{
_tran.Commit();
if (_tran.Connection != null) _tran.Commit();
isCommited = true;
_fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "提交", null));
@ -140,9 +140,9 @@ namespace FreeSql
var isRollbacked = false;
try
{
if (_tran != null && _tran.Connection != null)
if (_tran != null)
{
_tran.Rollback();
if (_tran.Connection != null) _tran.Rollback();
isRollbacked = true;
_fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "回滚", null));
}