From 2cac4c3094839ec3520fb33cb7a3fb4e5df2328c Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Thu, 12 Nov 2020 04:31:51 +0800 Subject: [PATCH] update to .net5.0 --- .editorconfig | 7 ++ .../TransactionalAttribute.cs | 2 + .../aspnetcore_transaction.csproj | 35 +++---- Examples/base_entity/base_entity.csproj | 49 +++++----- Examples/benchmarker/benchmarker.csproj | 6 +- Examples/dbcontext_01/dbcontext_01.csproj | 26 ++--- .../efcore_to_freesql.csproj | 24 ++--- Examples/orm_vs/Program.cs | 36 +++---- Examples/orm_vs/orm_vs.csproj | 44 ++++----- Examples/orm_vs_net40/orm_vs_net40.csproj | 5 + Examples/repository_01/repository_01.csproj | 10 +- Examples/restful/restful.csproj | 8 +- .../FreeSql.Generator.csproj | 2 +- FreeSql.DbContext/FreeSql.DbContext.csproj | 97 +++++++++---------- FreeSql.DbContext/FreeSql.DbContext.xml | 16 +++ FreeSql.DbContext/UnitOfWork/UnitOfWork.cs | 6 ++ FreeSql.Repository/FreeSql.Repository.csproj | 52 +++++----- FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj | 16 ++- .../FreeSql.Tests.DbContext.csproj | 50 +++++----- .../FreeSql.Tests.PerformanceTests.csproj | 49 +++++----- ...eeSql.Tests.Provider.MySqlConnector.csproj | 41 ++++---- .../FreeSql.Tests.Provider.Odbc.csproj | 42 ++++---- ...rovider.PostgreSQL.NetTopologySuite.csproj | 41 ++++---- .../FreeSql.Tests/FreeSql.Tests.csproj | 18 ++-- FreeSql/FreeSql.csproj | 25 +++-- .../FreeSql.Provider.Dameng.csproj | 86 ++++++++-------- .../FreeSql.Provider.Firebird.csproj | 22 ++--- .../FreeSql.Provider.KingbaseES.csproj | 44 ++++----- .../FreeSql.Provider.MsAccess.csproj | 32 +++--- .../FreeSql.Provider.MySql.csproj | 36 +++---- .../FreeSql.Provider.MySqlConnector.csproj | 24 ++--- .../FreeSql.Provider.Odbc.csproj | 32 +++--- .../FreeSql.Provider.Oracle.csproj | 26 ++--- .../FreeSql.Provider.PostgreSQL.csproj | 56 +++++------ .../FreeSql.Provider.ShenTong.csproj | 58 +++++------ .../FreeSql.Provider.SqlServer.csproj | 40 ++++---- ...FreeSql.Provider.SqlServerForSystem.csproj | 26 ++--- .../FreeSql.Provider.Sqlite.csproj | 30 +++--- 38 files changed, 641 insertions(+), 578 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..dc8efc5d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +[*.cs] + +# Default severity for analyzer diagnostics with category 'Style' +dotnet_analyzer_diagnostic.category-Style.severity = none + +# CS0649: 从未对字段“TransactionalAttribute._uowManager”赋值，字段将一直保持其默认值 null +dotnet_diagnostic.CS0649.severity = none diff --git a/Examples/aspnetcore_transaction/TransactionalAttribute.cs b/Examples/aspnetcore_transaction/TransactionalAttribute.cs index 2dd58ad2..875e03df 100644 --- a/Examples/aspnetcore_transaction/TransactionalAttribute.cs +++ b/Examples/aspnetcore_transaction/TransactionalAttribute.cs @@ -19,7 +19,9 @@ namespace FreeSql IsolationLevel? _IsolationLevelPriv; [DynamicProxyFromServices] +#pragma warning disable IDE0044 // 添加只读修饰符 UnitOfWorkManager _uowManager; +#pragma warning restore IDE0044 // 添加只读修饰符 IUnitOfWork _uow; public override Task Before(DynamicProxyBeforeArguments args) => OnBefore(_uowManager); diff --git a/Examples/aspnetcore_transaction/aspnetcore_transaction.csproj b/Examples/aspnetcore_transaction/aspnetcore_transaction.csproj index 6a13bfe0..ee51821c 100644 --- a/Examples/aspnetcore_transaction/aspnetcore_transaction.csproj +++ b/Examples/aspnetcore_transaction/aspnetcore_transaction.csproj @@ -1,23 +1,24 @@  - - netcoreapp3.1 - + + net5.0 + - - aspnetcore_transaction.xml - 3 - + + aspnetcore_transaction.xml + 3 + 1701;1702;1591 + - - - - - + + + + + + + + + + - - - - - diff --git a/Examples/base_entity/base_entity.csproj b/Examples/base_entity/base_entity.csproj index b2bcd550..aab00eea 100644 --- a/Examples/base_entity/base_entity.csproj +++ b/Examples/base_entity/base_entity.csproj @@ -1,31 +1,32 @@  - - Exe - netcoreapp3.1 - + + Exe + net5.0 + - - base_entity.xml - 3 - + + base_entity.xml + 3 + 1701;1702;1591 + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Examples/benchmarker/benchmarker.csproj b/Examples/benchmarker/benchmarker.csproj index 0a83a6e9..57d35001 100644 --- a/Examples/benchmarker/benchmarker.csproj +++ b/Examples/benchmarker/benchmarker.csproj @@ -2,17 +2,17 @@ Exe - netcoreapp3.1 + net5.0 - + - + diff --git a/Examples/dbcontext_01/dbcontext_01.csproj b/Examples/dbcontext_01/dbcontext_01.csproj index 5a84476d..2b5846c8 100644 --- a/Examples/dbcontext_01/dbcontext_01.csproj +++ b/Examples/dbcontext_01/dbcontext_01.csproj @@ -1,19 +1,19 @@  - - netcoreapp3.1 - InProcess - + + net5.0 + InProcess + - - - + + + - - - - - - + + + + + + diff --git a/Examples/efcore_to_freesql/efcore_to_freesql.csproj b/Examples/efcore_to_freesql/efcore_to_freesql.csproj index e6a6a3fb..738b47d0 100644 --- a/Examples/efcore_to_freesql/efcore_to_freesql.csproj +++ b/Examples/efcore_to_freesql/efcore_to_freesql.csproj @@ -1,18 +1,18 @@  - - netcoreapp3.1 - InProcess - + + net5.0 + InProcess + - - - + + + - - - - - + + + + + diff --git a/Examples/orm_vs/Program.cs b/Examples/orm_vs/Program.cs index 5de46db7..262b9816 100644 --- a/Examples/orm_vs/Program.cs +++ b/Examples/orm_vs/Program.cs @@ -18,8 +18,8 @@ namespace orm_vs class Program { static IFreeSql fsql = new FreeSql.FreeSqlBuilder() - .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=20") - //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=20") + //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=20") + .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=20") //.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=20") .UseAutoSyncStructure(false) .UseNoneCommandParameter(true) @@ -30,10 +30,10 @@ namespace orm_vs { get => new SqlSugarClient(new ConnectionConfig() { - ConnectionString = "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Min Pool Size=20;Max Pool Size=20", - DbType = DbType.SqlServer, - //ConnectionString = "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Min Pool Size=20;Max Pool Size=20", - //DbType = DbType.MySql, + //ConnectionString = "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Min Pool Size=20;Max Pool Size=20", + //DbType = DbType.SqlServer, + ConnectionString = "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Min Pool Size=20;Max Pool Size=20", + DbType = DbType.MySql, //ConnectionString = "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=21", //DbType = DbType.PostgreSQL, IsAutoCloseConnection = true, @@ -46,8 +46,8 @@ namespace orm_vs public DbSet Songs { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseSqlServer(@"Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Min Pool Size=21;Max Pool Size=21"); - //optionsBuilder.UseMySql("Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Min Pool Size=21;Max Pool Size=21"); + //optionsBuilder.UseSqlServer(@"Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Min Pool Size=21;Max Pool Size=21"); + optionsBuilder.UseMySql("Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Min Pool Size=21;Max Pool Size=21"); //optionsBuilder.UseNpgsql("Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=21"); } @@ -481,11 +481,11 @@ namespace orm_vs { using (var db = new SongContext()) { - db.Songs.Take(size).AsNoTracking().ToList(); + //db.Songs.Take(size).AsNoTracking().ToList(); } } sw.Stop(); - sb.AppendLine($"EFCore Select {size}条数据，循环{forTime}次，耗时{sw.ElapsedMilliseconds}ms"); + sb.AppendLine($"EFCore Select {size}条数据，循环{forTime}次，耗时{sw.ElapsedMilliseconds}ms .net5.0无效"); sw.Restart(); using (var conn = fsql.Ado.MasterPool.Get()) @@ -513,8 +513,8 @@ namespace orm_vs using (var db = new SongContext()) { //db.Configuration.AutoDetectChangesEnabled = false; - db.Songs.AddRange(songs.First()); - db.SaveChanges(); + //db.Songs.AddRange(songs.First()); + //db.SaveChanges(); //.net5.0 throw Microsoft.EntityFrameworkCore.DbUpdateException } Stopwatch sw = new Stopwatch(); @@ -552,12 +552,12 @@ namespace orm_vs using (var db = new SongContext()) { //db.Configuration.AutoDetectChangesEnabled = false; - db.Songs.AddRange(songs.ToArray()); - db.SaveChanges(); + //db.Songs.AddRange(songs.ToArray()); + //db.SaveChanges(); //.net5.0 throw Microsoft.EntityFrameworkCore.DbUpdateException } } sw.Stop(); - sb.AppendLine($"EFCore Insert {size}条数据，循环{forTime}次，耗时{sw.ElapsedMilliseconds}ms\r\n"); + sb.AppendLine($"EFCore Insert {size}条数据，循环{forTime}次，耗时{sw.ElapsedMilliseconds}ms .net5.0无效\r\n"); } static void Update(StringBuilder sb, int forTime, int size) @@ -599,12 +599,12 @@ namespace orm_vs using (var db = new SongContext()) { //db.Configuration.AutoDetectChangesEnabled = false; - db.Songs.UpdateRange(songs.ToArray()); - db.SaveChanges(); + //db.Songs.UpdateRange(songs.ToArray()); + //db.SaveChanges(); } } sw.Stop(); - sb.AppendLine($"EFCore Update {size}条数据，循环{forTime}次，耗时{sw.ElapsedMilliseconds}ms\r\n"); + sb.AppendLine($"EFCore Update {size}条数据，循环{forTime}次，耗时{sw.ElapsedMilliseconds}ms .net5.0无效\r\n"); } } diff --git a/Examples/orm_vs/orm_vs.csproj b/Examples/orm_vs/orm_vs.csproj index 1a49a72a..a7a240e4 100644 --- a/Examples/orm_vs/orm_vs.csproj +++ b/Examples/orm_vs/orm_vs.csproj @@ -1,29 +1,29 @@  - - Exe - netcoreapp3.1 - + + Exe + net5.0 + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - ..\..\..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll - - + + + ..\..\..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll + + diff --git a/Examples/orm_vs_net40/orm_vs_net40.csproj b/Examples/orm_vs_net40/orm_vs_net40.csproj index 42978d4e..b26d2626 100644 --- a/Examples/orm_vs_net40/orm_vs_net40.csproj +++ b/Examples/orm_vs_net40/orm_vs_net40.csproj @@ -66,5 +66,10 @@ 12.0.3 + + + .editorconfig + + \ No newline at end of file diff --git a/Examples/repository_01/repository_01.csproj b/Examples/repository_01/repository_01.csproj index fce8cda4..117523d1 100644 --- a/Examples/repository_01/repository_01.csproj +++ b/Examples/repository_01/repository_01.csproj @@ -1,18 +1,18 @@  - netcoreapp3.1 + net5.0 InProcess - + - - - + + + diff --git a/Examples/restful/restful.csproj b/Examples/restful/restful.csproj index 67461b06..9cdfdeff 100644 --- a/Examples/restful/restful.csproj +++ b/Examples/restful/restful.csproj @@ -1,17 +1,17 @@  - netcoreapp3.1 + net5.0 InProcess - + - - + + diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj index d7d057de..09c9a53f 100644 --- a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj +++ b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj @@ -19,7 +19,7 @@ - + diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj index 59074358..77905329 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.csproj +++ b/FreeSql.DbContext/FreeSql.DbContext.csproj @@ -1,56 +1,55 @@  - - netstandard2.0;netcoreapp31;netcoreapp30;netcoreapp22;netcoreapp21;net45;net40 - 2.0.0-preview1109 - true - FreeSql;ncc;YeXiangQin - FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access - https://github.com/2881099/FreeSql/wiki/DbContext - FreeSql ORM DbContext - git - MIT - $(AssemblyName) - logo.png - $(AssemblyName) - true - true - true - key.snk - false - + + netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40 + 2.0.0-preview1109 + true + FreeSql;ncc;YeXiangQin + FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access + https://github.com/2881099/FreeSql/wiki/DbContext + FreeSql ORM DbContext + git + MIT + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + true + key.snk + false + - - - - - - FreeSql.DbContext.xml - 3 - + + + - - net40 - - - netcoreapp - - - - - - - - - - - - - - + + FreeSql.DbContext.xml + 3 + 1701;1702;1591 + - - - + + net40 + + + netcoreapp + + + + + + + + + + + + + + + + diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index b3c14870..2d6d3409 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -130,6 +130,13 @@ 清空状态数据 + + + 根据 lambda 条件删除数据 + + + + 添加 @@ -502,5 +509,14 @@ + + + 批量注入 Repository，可以参考代码自行调整 + + + + + + diff --git a/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs b/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs index 7dea638a..6f0acb92 100644 --- a/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs +++ b/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs @@ -99,7 +99,9 @@ namespace FreeSql catch (Exception ex) { _fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "失败", ex)); +#pragma warning disable CA2200 // 再次引发以保留堆栈详细信息 throw ex; +#pragma warning restore CA2200 // 再次引发以保留堆栈详细信息 } return _tran; } @@ -123,7 +125,9 @@ namespace FreeSql { if (isCommited == false) _fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "提交失败", ex)); +#pragma warning disable CA2200 // 再次引发以保留堆栈详细信息 throw ex; +#pragma warning restore CA2200 // 再次引发以保留堆栈详细信息 } finally { @@ -147,7 +151,9 @@ namespace FreeSql { if (isRollbacked == false) _fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "回滚失败", ex)); +#pragma warning disable CA2200 // 再次引发以保留堆栈详细信息 throw ex; +#pragma warning restore CA2200 // 再次引发以保留堆栈详细信息 } finally { diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj index 9fd60073..b9b3403e 100644 --- a/FreeSql.Repository/FreeSql.Repository.csproj +++ b/FreeSql.Repository/FreeSql.Repository.csproj @@ -1,31 +1,31 @@  - - netstandard2.0;netcoreapp31;netcoreapp30;netcoreapp22;netcoreapp21;net45;net40 - 2.0.0-preview1109 - FreeSql;ncc;YeXiangQin - FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/翰高/Access, and read/write separation、and split table. - https://github.com/2881099/FreeSql/wiki/Repository - FreeSql ORM Repository - true - git - MIT - $(AssemblyName) - logo.png - $(AssemblyName) - true - true - true - key.snk - false - + + netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40 + 2.0.0-preview1109 + FreeSql;ncc;YeXiangQin + FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/翰高/Access, and read/write separation、and split table. + https://github.com/2881099/FreeSql/wiki/Repository + FreeSql ORM Repository + true + git + MIT + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + true + key.snk + false + - - - - - - - + + + + + + + diff --git a/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj b/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj index ef69f571..82e4790d 100644 --- a/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj +++ b/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj @@ -2,16 +2,22 @@ FreeSql.Tests.VB - netcoreapp3.1 + net5.0 false - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/FreeSql.Tests/FreeSql.Tests.DbContext/FreeSql.Tests.DbContext.csproj b/FreeSql.Tests/FreeSql.Tests.DbContext/FreeSql.Tests.DbContext.csproj index a0c1aeda..a5199d85 100644 --- a/FreeSql.Tests/FreeSql.Tests.DbContext/FreeSql.Tests.DbContext.csproj +++ b/FreeSql.Tests/FreeSql.Tests.DbContext/FreeSql.Tests.DbContext.csproj @@ -1,29 +1,33 @@  - - netcoreapp3.1 + + net5.0 + false + - false - + + 3 + 1701;1702;1591 + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + - - - - - - - - - - - diff --git a/FreeSql.Tests/FreeSql.Tests.PerformanceTests/FreeSql.Tests.PerformanceTests.csproj b/FreeSql.Tests/FreeSql.Tests.PerformanceTests/FreeSql.Tests.PerformanceTests.csproj index c86a28d6..4e2c84a2 100644 --- a/FreeSql.Tests/FreeSql.Tests.PerformanceTests/FreeSql.Tests.PerformanceTests.csproj +++ b/FreeSql.Tests/FreeSql.Tests.PerformanceTests/FreeSql.Tests.PerformanceTests.csproj @@ -1,29 +1,34 @@  - - netcoreapp3.1 + + net5.0 - false - + false + - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + 3 + 1701;1702;1591 + - - - - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/FreeSql.Tests.Provider.MySqlConnector.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/FreeSql.Tests.Provider.MySqlConnector.csproj index 07efc1f8..dd790895 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/FreeSql.Tests.Provider.MySqlConnector.csproj +++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/FreeSql.Tests.Provider.MySqlConnector.csproj @@ -1,25 +1,30 @@  - - netcoreapp3.1 + + net5.0 - false - + false + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + 3 + 1701;1702;1591 + - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/FreeSql.Tests.Provider.Odbc.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/FreeSql.Tests.Provider.Odbc.csproj index 6aded025..c6dc638d 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/FreeSql.Tests.Provider.Odbc.csproj +++ b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/FreeSql.Tests.Provider.Odbc.csproj @@ -1,27 +1,31 @@  - - netcoreapp3.1 + + net5.0 - false - + false + - - FreeSql.Tests.Provider.Odbc.xml - 3 - + + FreeSql.Tests.Provider.Odbc.xml + 3 + 1701;1702;1591 + - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - - - + + + + + + diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite.csproj index 04119115..651c636c 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite.csproj +++ b/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite.csproj @@ -1,25 +1,30 @@  - - netcoreapp3.1 + + net5.0 - false - + false + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + 3 + 1701;1702;1591 + - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj index 0d018a86..e67d2aa5 100644 --- a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj +++ b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj @@ -1,26 +1,26 @@  - netcoreapp3.1 - + net5.0 false - FreeSql.Tests.xml - 3 - false - x86 + FreeSql.Tests.xml + 3 + 1701;1702;1591 + false + x86 - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj index b142a887..e2f0deeb 100644 --- a/FreeSql/FreeSql.csproj +++ b/FreeSql/FreeSql.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,21 +21,18 @@ false - - - - - - - + + + - FreeSql.xml - 3 + FreeSql.xml + 3 + 1701;1702;1591 - - net40 - - + + net40 + + diff --git a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj index 03c420d8..17810cc7 100644 --- a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj +++ b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj @@ -1,50 +1,50 @@  - - netstandard2.0;net45;net40 - 2.0.0-preview1109 - true - FreeSql;ncc;YeXiangQin - FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider) - https://github.com/2881099/FreeSql - https://github.com/2881099/FreeSql - git - MIT - FreeSql;ORM;DM8;Dameng;达梦 - $(AssemblyName) - logo.png - $(AssemblyName) - true - true - + + netstandard2.0;net45;net40 + 2.0.0-preview1109 + true + FreeSql;ncc;YeXiangQin + FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider) + https://github.com/2881099/FreeSql + https://github.com/2881099/FreeSql + git + MIT + FreeSql;ORM;DM8;Dameng;达梦 + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + - - - - - - - Always - - + + + + + + + Always + + - - - + + + - - - lib\DmProvider\netstandard2.0\DmProvider.dll - false - - + + + lib\DmProvider\netstandard2.0\DmProvider.dll + false + + + + + ns20;netstandard20 + + + net40 + - - ns20;netstandard20 - - - net40 - - - + diff --git a/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj b/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj index c00a9a3c..3a7f7690 100644 --- a/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj +++ b/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj @@ -2,7 +2,7 @@ netstandard2.0;net452 - 2.0.0-preview1109 + 2.0.0-preview1109 true FreeSql;ncc;YeXiangQin FreeSql 数据库实现，基于 Firebird @@ -12,7 +12,7 @@ MIT FreeSql;ORM;Firebird;火鸟 $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,16 +21,16 @@ false - - - + + + - - - + + + - - - + + + diff --git a/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj b/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj index daaaf0a3..09125c62 100644 --- a/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj +++ b/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net461 + netstandard2.0;net461 2.0.0-preview1109 true FreeSql;ncc;YeXiangQin @@ -12,34 +12,34 @@ MIT FreeSql;ORM;人大金仓;金仓;Kdbndp $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true - - - - - - Always - - + + + + + + Always + + - - - + + + - - - lib\Kdbndp.dll - false - - + + + lib\Kdbndp.dll + false + + - - ns20;netstandard20 - + + ns20;netstandard20 + diff --git a/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj b/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj index a5a3647b..d47ddf37 100644 --- a/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj +++ b/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;Access $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,21 +21,21 @@ false - - - - - - - - - + - - - net40 - - + + + + + + + + + + + net40 + + - + diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj index 6c2b1f37..e33bc0a9 100644 --- a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj +++ b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;MySql;MariaDB;Tidb $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,24 +21,24 @@ false - - - - - - - - - - - - - + - - net40 - - + + + + + + + + + + + + + + net40 + + diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj index f9c87445..a450b62e 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj +++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;MySql;MariaDB;Tidb $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,27 +21,27 @@ false - - - - - + + + + + - + - + - - MySqlConnector - - + + MySqlConnector + + diff --git a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj index 329f36cb..83aaa64b 100644 --- a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj +++ b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;Odbc $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,21 +21,21 @@ false - - - - - - - - - + - - - net40 - - + + + + + + + + + + + net40 + + - + diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj index 36ff42f7..da2baff1 100644 --- a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj +++ b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;Oracle $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,25 +21,25 @@ false - - - - + + + + - + - + - + - - net40 - - + + net40 + + - + diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj index 03a42283..e26ef931 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj +++ b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;PostgreSQL;pgsql $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,33 +21,33 @@ false - - - - - - - - - - - - - - - - - - net45 - - - - nts - - - - + - + + + + + + + + + + + + + + + + net45 + + + + nts + + + + + + diff --git a/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj b/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj index c41bb2db..748e0c04 100644 --- a/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj +++ b/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net45;net40 + netstandard2.0;net45;net40 2.0.0-preview1109 true FreeSql;ncc;YeXiangQin @@ -12,41 +12,41 @@ MIT FreeSql;ORM;ShenTong;Oscar;神通;神舟通用 $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true - - - - - - - - - - Always - - + + + + + + + + + + Always + + - - - + + + - - - lib\System.Data.OscarClient.dll - false - - + + + lib\System.Data.OscarClient.dll + false + + - - ns20;netstandard20 - - - net40 - + + ns20;netstandard20 + + + net40 + diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj index 47166f17..3693d6e8 100644 --- a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj +++ b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;SqlServer;mssql $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,26 +21,26 @@ key.snk - - - - - - - - - - - - + - - microsoft - - - net40 - - + + + + + + + + + + + + + microsoft + + + net40 + + diff --git a/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj index b7fade71..6330b3e3 100644 --- a/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj +++ b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;SqlServer;mssql $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,24 +21,24 @@ false - - - - - - - + + + + + + + - + - - net40 - - + + net40 + + diff --git a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj index 33e2e388..97accd42 100644 --- a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj +++ b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj @@ -12,7 +12,7 @@ MIT FreeSql;ORM;sqlite $(AssemblyName) - logo.png + logo.png $(AssemblyName) true true @@ -21,23 +21,23 @@ false - - - - - - + + - + - - ns20;netstandard20 - - - net40 - - + + + + + + ns20;netstandard20 + + + net40 + +