v2.0.0-preview1026 #502 #500

FreeSql.DbContext/FreeSql.DbContext.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp31;netcoreapp30;netcoreapp22;netcoreapp21;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</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>

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -130,6 +130,13 @@
             清空状态数据
             </summary>
         </member>
+        <member name="M:FreeSql.DbSet`1.RemoveAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
+            <summary>
+            根据 lambda 条件删除数据
+            </summary>
+            <param name="predicate"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.DbSet`1.Add(`0)">
             <summary>
             添加
@@ -350,24 +357,6 @@
             <param name="isCreate">若未开启事务，则开启</param>
             <returns></returns>
         </member>
-        <member name="P:FreeSql.IUnitOfWork.Enable">
-            <summary>
-            是否启用工作单元
-            </summary>
-        </member>
-        <member name="M:FreeSql.IUnitOfWork.Close">
-            <summary>
-            禁用工作单元
-            <exception cref="T:System.Exception"></exception>
-            <para></para>
-            若已开启事务（已有Insert/Update/Delete操作），调用此方法将发生异常，建议在执行逻辑前调用
-            </summary>
-        </member>
-        <member name="M:FreeSql.IUnitOfWork.Open">
-            <summary>
-            开启工作单元
-            </summary>
-        </member>
         <member name="P:FreeSql.IUnitOfWork.EntityChangeReport">
             <summary>
             工作单元内的实体变化跟踪
@@ -444,11 +433,6 @@
             以嵌套事务方式执行。
             </summary>
         </member>
-        <member name="F:FreeSql.Propagation.Requierd">
-            <summary>
-            错误的命名，请使用 Required，在 2.0.0 删除
-            </summary>
-        </member>
         <member name="M:FreeSqlDbContextExtensions.Entity``1(FreeSql.ICodeFirst,System.Action{FreeSql.Extensions.EfCoreFluentApi.EfCoreTableFluent{``0}})">
             <summary>
             EFCore 95% 相似的 FluentApi 扩展方法
@@ -525,13 +509,13 @@
             <param name="that"></param>
             <returns></returns>
         </member>
-    </members>
-</doc>
-me="M:FreeSqlDbContextExtensions.CreateUnitOfWork(IFreeSql)">
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
             <summary>
-            创建基于仓储功能的工作单元，务必使用 using 包含使用
+            批量注入 Repository，可以参考代码自行调整
             </summary>
-            <param name="that"></param>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
             <returns></returns>
         </member>
     </members>

FreeSql.DbContext/UnitOfWork/IUnitOfWork.cs

@@ -25,27 +25,6 @@ namespace FreeSql
 
         void Rollback();
 
-        /// <summary>
-        /// 是否启用工作单元
-        /// </summary>
-        [Obsolete("即将删除（保留到2020-12-01），请改用 UnitOfWorkManager 的方式管理事务 https://github.com/dotnetcore/FreeSql/issues/289")] 
-        bool Enable { get; }
-
-        /// <summary>
-        /// 禁用工作单元
-        /// <exception cref="Exception"></exception>
-        /// <para></para>
-        /// 若已开启事务（已有Insert/Update/Delete操作），调用此方法将发生异常，建议在执行逻辑前调用
-        /// </summary>
-        [Obsolete("即将删除（保留到2020-12-01），请改用 UnitOfWorkManager 的方式管理事务 https://github.com/dotnetcore/FreeSql/issues/289")]
-        void Close();
-
-        /// <summary>
-        /// 开启工作单元
-        /// </summary>
-        [Obsolete("即将删除（保留到2020-12-01），请改用 UnitOfWorkManager 的方式管理事务 https://github.com/dotnetcore/FreeSql/issues/289")]
-        void Open();
-
         /// <summary>
         /// 工作单元内的实体变化跟踪
         /// </summary>

FreeSql.DbContext/UnitOfWork/UnitOfWorkManager.cs

@@ -87,7 +87,6 @@ namespace FreeSql
         /// <returns></returns>
         public IUnitOfWork Begin(Propagation propagation = Propagation.Required, IsolationLevel? isolationLevel = null)
         {
-            if (propagation == Propagation.Requierd) propagation = Propagation.Required;
             switch (propagation)
             {
                 case Propagation.Required: return FindedUowCreateVirtual() ?? CreateUow(isolationLevel);
@@ -189,10 +188,6 @@ namespace FreeSql
             public IsolationLevel? IsolationLevel { get => _baseUow.IsolationLevel; set => _baseUow.IsolationLevel = value; }
             public DbContext.EntityChangeReport EntityChangeReport => _baseUow.EntityChangeReport;
 
-            public bool Enable => _baseUow.Enable;
-            public void Close() => _baseUow.Close();
-            public void Open() => _baseUow.Open();
-
             public DbTransaction GetOrBeginTransaction(bool isCreate = true) => _baseUow.GetOrBeginTransaction(isCreate);
             public void Commit() => _baseUow.Commit();
             public void Rollback() => _baseUow.Rollback();
@@ -211,10 +206,6 @@ namespace FreeSql
             public IsolationLevel? IsolationLevel { get => _baseUow.IsolationLevel; set { } }
             public DbContext.EntityChangeReport EntityChangeReport => _baseUow.EntityChangeReport;
 
-            public bool Enable => _baseUow.Enable;
-            public void Close() => _baseUow.Close();
-            public void Open() => _baseUow.Open();
-
             public DbTransaction GetOrBeginTransaction(bool isCreate = true) => _baseUow.GetOrBeginTransaction(isCreate);
             public void Commit() { }
             public void Rollback() => _baseUow.Rollback();
@@ -229,10 +220,6 @@ namespace FreeSql
             public IsolationLevel? IsolationLevel { get; set; }
             public DbContext.EntityChangeReport EntityChangeReport { get; } = new DbContext.EntityChangeReport();
 
-            public bool Enable { get; }
-            public void Close() { }
-            public void Open() { }
-
             public DbTransaction GetOrBeginTransaction(bool isCreate = true) => null;
             public void Commit()
             {
@@ -273,13 +260,6 @@ namespace FreeSql
         /// <summary>
         /// 以嵌套事务方式执行。
         /// </summary>
-        Nested,
-
-
-        /// <summary>
-        /// 错误的命名，请使用 Required，在 2.0.0 删除
-        /// </summary>
-        [Obsolete("错误的命名，请使用 Required，在 2.0.0 删除")]
-        Requierd = 404
+        Nested
     }
 }