v2.0.0-preview1026 #502 #500

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用.</Description>

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储.</Description>

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 扩展包，可实现【延时加载】属性.</Description>

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 扩展包，实现 linq queryable 和 linq to sql 语法进行开发.</Description>

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

@@ -12,7 +12,7 @@
     <Description>使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator</Description>
     <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
     <RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
   </PropertyGroup>
 

FreeSql.All/FreeSql.All.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 全家桶，懒人专用</Description>

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>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
-</doc>
-me="M:FreeSqlDbContextExtensions.CreateUnitOfWork(IFreeSql)">
             <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,
+        Nested
-
-
-        /// <summary>
-        /// 错误的命名，请使用 Required，在 2.0.0 删除
-        /// </summary>
-        [Obsolete("错误的命名，请使用 Required，在 2.0.0 删除")]
-        Requierd = 404
     }
 }

FreeSql.Repository/FreeSql.Repository.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>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/Access, and read/write separation、and split table.</Description>
     <PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl>

FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs

@@ -135,89 +135,6 @@ namespace FreeSql.Tests
             }
         }
 
-        [Fact]
-        public void UnitOfWorkRepositoryWithDisableBeforeInsert()
-        {
-            foreach (var fsql in new[] { g.sqlite, })
-            {
-                fsql.CodeFirst.ConfigEntity<FlowModel>(f =>
-                {
-                    f.Property(b => b.UserId).IsPrimary(true);
-                    f.Property(b => b.Id).IsPrimary(true).IsIdentity(true);
-                    f.Property(b => b.Name).IsNullable(false);
-                });
-
-                var flowRepos = fsql.GetRepository<FlowModel>();
-
-                var flow = new FlowModel()
-                {
-                    CreateTime = DateTime.Now,
-                    Name = "aaa",
-                    LastModifyTime = DateTime.Now,
-                    UserId = 1,
-                };
-
-                //清理掉数据库中已存在的数据，为了接下来的插入测试
-                flowRepos.Delete(a => a.UserId == 1 && a.Name == "aaa");
-
-                using (var uow = fsql.CreateUnitOfWork())
-                {
-                    //关闭工作单元（不会开始事务）
-                    uow.Close();
-                    var uowFlowRepos = uow.GetRepository<FlowModel>();
-                    uowFlowRepos.Insert(flow);
-                    uowFlowRepos.Orm.Select<FlowModel>().ToList();
-                    //已关闭工作单元，提不提交都没影响，此处注释来确定工作单元开关是否生效：关闭了，不Commit也应该插入数据
-                    //uow.Commit();
-                }
-
-                Assert.True(flowRepos.Select.Any(a => a.UserId == 1 && a.Name == "aaa"));
-            }
-
-        }
-
-        [Fact]
-        public void UnitOfWorkRepositoryWithDisableAfterInsert()
-        {
-            foreach (var fsql in new[] { g.sqlite, })
-            {
-                fsql.CodeFirst.ConfigEntity<FlowModel>(f =>
-                {
-                    f.Property(b => b.UserId).IsPrimary(true);
-                    f.Property(b => b.Id).IsPrimary(true).IsIdentity(true);
-                    f.Property(b => b.Name).IsNullable(false);
-                });
-
-                var flowRepos = fsql.GetRepository<FlowModel>();
-
-                //清理掉数据库中已存在的数据，为了接下来的插入测试
-                flowRepos.Delete(a => a.UserId == 1 && a.Name == "aaa");
-
-                var flow = new FlowModel()
-                {
-                    CreateTime = DateTime.Now,
-                    Name = "aaa",
-                    LastModifyTime = DateTime.Now,
-                    UserId = 1,
-                };
-
-
-                Assert.Throws<Exception>(() =>
-                {
-                    using (var uow = fsql.CreateUnitOfWork())
-                    {
-                        var uowFlowRepos = uow.GetRepository<FlowModel>();
-                        uowFlowRepos.Insert(flow);
-                        uowFlowRepos.Orm.Select<FlowModel>().ToList();
-                        //有了任意 Insert/Update/Delete 调用关闭uow的方法将会发生异常
-                        uow.Close();
-                        uow.Commit();
-                    }
-
-                });
-            }
-        }
-
         [Fact]
         public void UnitOfWorkRepositoryWithoutDisable()
         {

FreeSql/FreeSql.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;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>

Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider)</Description>

Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
-    <Version>1.10.1</Version>
+    <Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 Firebird</Description>

Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 人大金仓数据库 Ado.Net (Kdbndp)</Description>

Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库 Ms Access 实现</Description>

Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net452;net451;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySql.Data（Oracle官方）</Description>

Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySqlConnector</Description>

Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库 Odbc 实现，基于 {Oracle}、{SQL Server}、{MySQL ODBC 8.0 Unicode Driver}、{PostgreSQL Unicode(x64)}、{DM8 ODBC Driver} 专用访问实现，以及通用 Odbc 访问所有数据库</Description>

Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 Oracle 11</Description>

Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net461;net452;net451;net45</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 PostgreSQL 9.5</Description>

Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 神舟通用数据库 7.0.8</Description>

Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net451;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next</Description>

Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net451;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 System.Data.SqlClient + SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next</Description>

Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>1.10.1</Version>
+		<Version>2.0.0-preview1026</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 Sqlite 3.0，支持 .NetCore、.NetFramework、Xamarin</Description>