添加对.netstandard2.0和.netstandard2.1的支持

xuejmnet · xuejmnet · commit c2f14e3a7689 · 2022-09-29T09:06:30.000+08:00
diff --git a/README-zh.md b/README-zh.md
@@ -44,9 +44,9 @@ Release  | EF Core | .NET  | .NET (Core)
 
 Release  | .NET (Core) 
 --- |  --- 
-[6.x.x.x](https://www.nuget.org/packages/ShardingCore) |  6.0
-[5.x.x.x](https://www.nuget.org/packages/ShardingCore) |  5.0
-[3.x.x.x](https://www.nuget.org/packages/ShardingCore) |  netcoreapp3
+[6.x.x.x](https://www.nuget.org/packages/ShardingCore) |  net6
+[5.x.x.x](https://www.nuget.org/packages/ShardingCore) |  net5 or netstandard2.1
+[3.x.x.x](https://www.nuget.org/packages/ShardingCore) |  netcoreapp3 or netstandard2.0
 [2.x.x.x](https://www.nuget.org/packages/ShardingCore) |  netcoreapp2
 
 
diff --git a/README.md b/README.md
@@ -43,9 +43,9 @@ Use Condition Compile With NetFramework not
 
 Release  | .NET (Core) 
 --- |  --- 
-[6.x.x.x](https://www.nuget.org/packages/ShardingCore) |  6.0
-[5.x.x.x](https://www.nuget.org/packages/ShardingCore) |  5.0
-[3.x.x.x](https://www.nuget.org/packages/ShardingCore) |  netcoreapp3
+[6.x.x.x](https://www.nuget.org/packages/ShardingCore) |  net6
+[5.x.x.x](https://www.nuget.org/packages/ShardingCore) |  net5 or netstandard2.1
+[3.x.x.x](https://www.nuget.org/packages/ShardingCore) |  netcoreapp3 or netstandard2.0
 [2.x.x.x](https://www.nuget.org/packages/ShardingCore) |  netcoreapp2
 
 ## Quick start
diff --git a/src/ShardingCore/EFCores/ChangeTrackers/ShardingChangeTracker.cs b/src/ShardingCore/EFCores/ChangeTrackers/ShardingChangeTracker.cs
@@ -20,7 +20,7 @@ public ShardingChangeTracker(DbContext context, IStateManager stateManager, ICha
             _dbContext = context;
         }
 
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
 
@@ -122,7 +122,7 @@ public override void CascadeChanges()
         }
 
 #endif
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0
+#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_0
         public override void Clear()
         {
             if (_dbContext is IShardingDbContext)
diff --git a/src/ShardingCore/EFCores/EFCore3x/ScriptMigrationGenerator.cs b/src/ShardingCore/EFCores/EFCore3x/ScriptMigrationGenerator.cs
@@ -1,4 +1,4 @@
-#if NETCOREAPP3_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0  || NETSTANDARD2_0
 using Microsoft.EntityFrameworkCore.Migrations;
 using ShardingCore.Core.RuntimeContexts;
 
diff --git a/src/ShardingCore/EFCores/EFCore3x/ShardingModelSource.cs b/src/ShardingCore/EFCores/EFCore3x/ShardingModelSource.cs
@@ -1,4 +1,4 @@
-﻿#if NETCOREAPP3_0
+﻿#if NETCOREAPP3_0 || NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/ShardingCore/EFCores/EFCore5x/ScriptMigrationGenerator.cs b/src/ShardingCore/EFCores/EFCore5x/ScriptMigrationGenerator.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if NET5_0 || NETSTANDARD2_1
 using Microsoft.EntityFrameworkCore.Migrations;
 using ShardingCore.Core.RuntimeContexts;
 
diff --git a/src/ShardingCore/EFCores/EFCore5x/ShardingModelSource.cs b/src/ShardingCore/EFCores/EFCore5x/ShardingModelSource.cs
@@ -1,4 +1,4 @@
-﻿#if NET5_0
+﻿#if NET5_0 || NETSTANDARD2_1
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/ShardingCore/EFCores/OptionsExtensions/ShardingOptionsExtension.cs b/src/ShardingCore/EFCores/OptionsExtensions/ShardingOptionsExtension.cs
@@ -14,7 +14,7 @@ namespace ShardingCore.EFCores.OptionsExtensions
     * @Ver: 1.0
     * @Email: 326308290@qq.com
     */
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
 
@@ -63,7 +63,7 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
         }
     }
 #endif
-#if NETCOREAPP3_0 || NET5_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0 || NET5_0 || NETSTANDARD2_1
      public class ShardingOptionsExtension: IDbContextOptionsExtension
     {
         public IShardingRuntimeContext ShardingRuntimeContext { get; }
diff --git a/src/ShardingCore/EFCores/OptionsExtensions/ShardingWrapOptionsExtension.cs b/src/ShardingCore/EFCores/OptionsExtensions/ShardingWrapOptionsExtension.cs
@@ -15,7 +15,7 @@ namespace ShardingCore.EFCores.OptionsExtensions
     * @Email: 326308290@qq.com
     */
 
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
 #if NET6_0
@@ -55,7 +55,7 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
         }
     }
 #endif
-#if NETCOREAPP3_0 || NET5_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0 || NET5_0 || NETSTANDARD2_1
 
      public class ShardingWrapOptionsExtension: IDbContextOptionsExtension
     {
diff --git a/src/ShardingCore/EFCores/OptionsExtensions/UnionAllMergeOptionsExtension.cs b/src/ShardingCore/EFCores/OptionsExtensions/UnionAllMergeOptionsExtension.cs
@@ -14,7 +14,7 @@ namespace ShardingCore.EFCores.OptionsExtensions
     * @Email: 326308290@qq.com
     */
 
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
 #if NET6_0
@@ -50,7 +50,7 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
         }
     }
 #endif
-#if NETCOREAPP3_0 || NET5_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0 || NET5_0 || NETSTANDARD2_1
 
      public class UnionAllMergeOptionsExtension: IDbContextOptionsExtension
     {
diff --git a/src/ShardingCore/EFCores/RelationTransactions/ShardingRelationalTransaction.cs b/src/ShardingCore/EFCores/RelationTransactions/ShardingRelationalTransaction.cs
@@ -20,7 +20,7 @@ namespace ShardingCore.EFCores
     * @Ver: 1.0
     * @Email: 326308290@qq.com
     */
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
     public class ShardingRelationalTransaction : RelationalTransaction
@@ -34,7 +34,7 @@ public ShardingRelationalTransaction(IShardingDbContext shardingDbContext, IRela
         }
 
 #endif
-#if NETCOREAPP3_0 || NET5_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0 || NET5_0 || NETSTANDARD2_1
         public ShardingRelationalTransaction(IShardingDbContext shardingDbContext, IRelationalConnection connection,
             DbTransaction transaction, Guid transactionId,
             IDiagnosticsLogger<DbLoggerCategory.Database.Transaction> logger, bool transactionOwned) : base(connection,
diff --git a/src/ShardingCore/EFCores/ShardingDbSetSource.cs b/src/ShardingCore/EFCores/ShardingDbSetSource.cs
@@ -12,10 +12,10 @@ namespace ShardingCore.EFCores
     * @Date: Saturday, 14 August 2021 10:17:43
     * @Email: 326308290@qq.com
     */
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
-#if NET5_0 || NET6_0
+#if NET5_0 || NETSTANDARD2_1 || NET6_0
     public class ShardingDbSetSource : IDbSetSource
     {
 
@@ -55,7 +55,7 @@ private static Func<DbContext, string, object> CreateSetFactory<TEntity>()
             => (c, name) => new ShardingInternalDbSet<TEntity>(c, name);
     }
 #endif
-#if NETCOREAPP3_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0
     public class ShardingDbSetSource:IDbSetSource
     {
         
diff --git a/src/ShardingCore/EFCores/ShardingInternalDbSet.cs b/src/ShardingCore/EFCores/ShardingInternalDbSet.cs
@@ -26,7 +26,7 @@ namespace ShardingCore.EFCores
     * @Email: 326308290@qq.com
     */
 
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
     public class ShardingInternalDbSet<TEntity> : InternalDbSet<TEntity>
@@ -36,15 +36,15 @@ public class ShardingInternalDbSet<TEntity> : InternalDbSet<TEntity>
         private readonly IShardingRuntimeContext _shardingRuntimeContext;
         private LocalView<TEntity>? _localView;
 
-#if NET5_0 || NET6_0
+#if NET5_0 || NETSTANDARD2_1 || NET6_0
 
         public ShardingInternalDbSet(DbContext context, string entityTypeName) : base(context, entityTypeName)
         {
             _context = (IShardingDbContext)context;
             _shardingRuntimeContext = context.GetShardingRuntimeContext();
         }
 #endif
-#if NETCOREAPP2_0 || NETCOREAPP3_0
+#if NETCOREAPP2_0 || NETCOREAPP3_0 || NETSTANDARD2_0
         public ShardingInternalDbSet(DbContext context) : base(context)
         {
             _context = (IShardingDbContext)context;
diff --git a/src/ShardingCore/EFCores/ShardingMigrator.cs b/src/ShardingCore/EFCores/ShardingMigrator.cs
@@ -35,7 +35,7 @@ public class ShardingMigrator:Migrator
     {
         private readonly IShardingRuntimeContext _shardingRuntimeContext;
 
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
 
@@ -46,14 +46,14 @@ public ShardingMigrator(IShardingRuntimeContext shardingRuntimeContext,IMigratio
 
         }
 #endif
-#if NET5_0
+#if NET5_0 || NETSTANDARD2_1
         public ShardingMigrator(IShardingRuntimeContext shardingRuntimeContext, IMigrationsAssembly migrationsAssembly, IHistoryRepository historyRepository, IDatabaseCreator databaseCreator, IMigrationsSqlGenerator migrationsSqlGenerator, IRawSqlCommandBuilder rawSqlCommandBuilder, IMigrationCommandExecutor migrationCommandExecutor, IRelationalConnection connection, ISqlGenerationHelper sqlGenerationHelper, ICurrentDbContext currentContext, IConventionSetBuilder conventionSetBuilder, IDiagnosticsLogger<DbLoggerCategory.Migrations> logger, IDiagnosticsLogger<DbLoggerCategory.Database.Command> commandLogger, IDatabaseProvider databaseProvider) : base(migrationsAssembly, historyRepository, databaseCreator, migrationsSqlGenerator, rawSqlCommandBuilder, migrationCommandExecutor, connection, sqlGenerationHelper, currentContext, conventionSetBuilder, logger, commandLogger, databaseProvider)
         {
             _shardingRuntimeContext = shardingRuntimeContext;
         }
 #endif
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0
         public ShardingMigrator(IShardingRuntimeContext shardingRuntimeContext, IMigrationsAssembly migrationsAssembly, IHistoryRepository historyRepository, IDatabaseCreator databaseCreator, IMigrationsSqlGenerator migrationsSqlGenerator, IRawSqlCommandBuilder rawSqlCommandBuilder, IMigrationCommandExecutor migrationCommandExecutor, IRelationalConnection connection, ISqlGenerationHelper sqlGenerationHelper, ICurrentDbContext currentContext, IDiagnosticsLogger<DbLoggerCategory.Migrations> logger, IDiagnosticsLogger<DbLoggerCategory.Database.Command> commandLogger, IDatabaseProvider databaseProvider) : base(migrationsAssembly, historyRepository, databaseCreator, migrationsSqlGenerator, rawSqlCommandBuilder, migrationCommandExecutor, connection, sqlGenerationHelper, currentContext, logger, commandLogger, databaseProvider)
         {
             _shardingRuntimeContext = shardingRuntimeContext;
@@ -81,15 +81,15 @@ public override void Migrate(string targetMigration = null)
            await DynamicShardingHelper.DynamicMigrateWithDataSourcesAsync(_shardingRuntimeContext, allDataSourceNames, null,cancellationToken);
 
         }
-#if NET6_0 || NET5_0
+#if NET6_0 || NET5_0 || NETSTANDARD2_1
 
         public override string GenerateScript(string fromMigration = null, string toMigration = null,
             MigrationsSqlGenerationOptions options = MigrationsSqlGenerationOptions.Default)
         {
           return new ScriptMigrationGenerator(_shardingRuntimeContext, fromMigration, toMigration, options).GenerateScript();
         }
 #endif
-#if NETCOREAPP3_0 || NETCOREAPP2_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0 || NETCOREAPP2_0
         public override string GenerateScript(string fromMigration = null, string toMigration = null, bool idempotent = false)
         {
             return new ScriptMigrationGenerator(_shardingRuntimeContext, fromMigration, toMigration, idempotent).GenerateScript();
diff --git a/src/ShardingCore/EFCores/ShardingRelationalTransactionFactory.cs b/src/ShardingCore/EFCores/ShardingRelationalTransactionFactory.cs
@@ -18,7 +18,7 @@ namespace ShardingCore.EFCores
     * @Ver: 1.0
     * @Email: 326308290@qq.com
     */
-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0
     error
 #endif
 #if NET6_0
@@ -38,7 +38,7 @@ public override RelationalTransaction Create(IRelationalConnection connection, D
         }
     }
 #endif
-#if NETCOREAPP3_0 || NET5_0
+#if NETCOREAPP3_0 || NETSTANDARD2_0 || NET5_0 || NETSTANDARD2_1
 
     public class ShardingRelationalTransactionFactory<TShardingDbContext> : RelationalTransactionFactory where TShardingDbContext : DbContext, IShardingDbContext
     {
diff --git a/src/ShardingCore/EFCores/ShardingRelationalTransactionManager.cs b/src/ShardingCore/EFCores/ShardingRelationalTransactionManager.cs
@@ -112,7 +112,7 @@ public IDbContextTransaction UseTransaction(DbTransaction transaction)
             _shardingDbContext.NotifyShardingTransaction();
             return dbContextTransaction;
         }
-#if !NETCOREAPP3_0
+#if !NETCOREAPP3_0 && !NETSTANDARD2_0
 
         public Task CommitTransactionAsync(CancellationToken cancellationToken = new CancellationToken())
         {
diff --git a/src/ShardingCore/Extensions/DbContextExtension.cs b/src/ShardingCore/Extensions/DbContextExtension.cs
diff --git a/src/ShardingCore/Extensions/LinqExtension.cs b/src/ShardingCore/Extensions/LinqExtension.cs
diff --git a/src/ShardingCore/Sharding/Enumerators/StreamMergeAsync/OneAtMostElementStreamMergeAsyncEnumerator.cs b/src/ShardingCore/Sharding/Enumerators/StreamMergeAsync/OneAtMostElementStreamMergeAsyncEnumerator.cs
diff --git a/src/ShardingCore/Sharding/Parsers/Visitors/ShardingQueryPrepareVisitor.cs b/src/ShardingCore/Sharding/Parsers/Visitors/ShardingQueryPrepareVisitor.cs
diff --git a/src/ShardingCore/Sharding/ShardingEntityFrameworkQueryableExtensions.cs b/src/ShardingCore/Sharding/ShardingEntityFrameworkQueryableExtensions.cs
diff --git a/src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor.cs b/src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor.cs
diff --git a/src/ShardingCore/Sharding/Visitors/Querys/QueryEntitiesVisitor.cs b/src/ShardingCore/Sharding/Visitors/Querys/QueryEntitiesVisitor.cs
diff --git a/src/ShardingCore/ShardingCore.csproj b/src/ShardingCore/ShardingCore.csproj

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public ShardingChangeTracker(DbContext context, IStateManager stateManager, ICha`
`20`	`20`	`_dbContext = context;`
`21`	`21`	`}`
`22`	`22`
`23`		`-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0`
	`23`	`+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0`
`24`	`24`	`error`
`25`	`25`	`#endif`
`26`	`26`
`@@ -122,7 +122,7 @@ public override void CascadeChanges()`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`#endif`
`125`		`-#if !NETCOREAPP2_0 && !NETCOREAPP3_0`
	`125`	`+#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_0`
`126`	`126`	`public override void Clear()`
`127`	`127`	`{`
`128`	`128`	`if (_dbContext is IShardingDbContext)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETCOREAPP3_0`
	`1`	`+#if NETCOREAPP3_0 \|\| NETSTANDARD2_0 \|\| NETSTANDARD2_0`
`2`	`2`	`using Microsoft.EntityFrameworkCore.Migrations;`
`3`	`3`	`using ShardingCore.Core.RuntimeContexts;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETCOREAPP3_0`
	`1`	`+#if NETCOREAPP3_0 \|\| NETSTANDARD2_0`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NET5_0`
	`1`	`+#if NET5_0 \|\| NETSTANDARD2_1`
`2`	`2`	`using Microsoft.EntityFrameworkCore.Migrations;`
`3`	`3`	`using ShardingCore.Core.RuntimeContexts;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace ShardingCore.EFCores.OptionsExtensions`
`14`	`14`	`* @Ver: 1.0`
`15`	`15`	`* @Email: 326308290@qq.com`
`16`	`16`	`*/`
`17`		`-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0`
	`17`	`+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0`
`18`	`18`	`error`
`19`	`19`	`#endif`
`20`	`20`
`@@ -63,7 +63,7 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`#endif`
`66`		`-#if NETCOREAPP3_0 \|\| NET5_0`
	`66`	`+#if NETCOREAPP3_0 \|\| NETSTANDARD2_0 \|\| NET5_0 \|\| NETSTANDARD2_1`
`67`	`67`	`public class ShardingOptionsExtension: IDbContextOptionsExtension`
`68`	`68`	`{`
`69`	`69`	`public IShardingRuntimeContext ShardingRuntimeContext { get; }`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace ShardingCore.EFCores.OptionsExtensions`
`15`	`15`	`* @Email: 326308290@qq.com`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#if !NETCOREAPP2_0 && !NETCOREAPP3_0 && !NET5_0 && !NET6_0`
	`18`	`+#if !NETCOREAPP2_0 && !NETSTANDARD2_0 && !NETCOREAPP3_0 && !NETSTANDARD2_1 && !NET5_0 && !NET6_0`
`19`	`19`	`error`
`20`	`20`	`#endif`
`21`	`21`	`#if NET6_0`
`@@ -55,7 +55,7 @@ public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`#endif`
`58`		`-#if NETCOREAPP3_0 \|\| NET5_0`
	`58`	`+#if NETCOREAPP3_0 \|\| NETSTANDARD2_0 \|\| NET5_0 \|\| NETSTANDARD2_1`
`59`	`59`
`60`	`60`	`public class ShardingWrapOptionsExtension: IDbContextOptionsExtension`
`61`	`61`	`{`