diff --git a/nuget-publish.bat b/nuget-publish.bat index ab51070f..f543c2bb 100644 --- a/nuget-publish.bat +++ b/nuget-publish.bat @@ -1,9 +1,9 @@ :start ::定义版本 -set EFCORE2=2.3.1.76 -set EFCORE3=3.3.1.76 -set EFCORE5=5.3.1.76 -set EFCORE6=6.3.1.76 +set EFCORE2=2.3.1.77 +set EFCORE3=3.3.1.77 +set EFCORE5=5.3.1.77 +set EFCORE6=6.3.1.77 ::删除所有bin与obj下的文件 @echo off diff --git a/src/ShardingCore/DIExtensions/ShardingCoreConfigBuilder.cs b/src/ShardingCore/DIExtensions/ShardingCoreConfigBuilder.cs index 92586aab..62b63e69 100644 --- a/src/ShardingCore/DIExtensions/ShardingCoreConfigBuilder.cs +++ b/src/ShardingCore/DIExtensions/ShardingCoreConfigBuilder.cs @@ -103,7 +103,9 @@ namespace ShardingCore.DIExtensions public bool? IgnoreCreateTableError { get; set; } = true; public int MaxQueryConnectionsLimit { get; set; } = Environment.ProcessorCount; public ConnectionModeEnum ConnectionMode { get; set; } = ConnectionModeEnum.SYSTEM_AUTO; + [Obsolete] public bool? EnableTableRouteCompileCache { get; set; } + [Obsolete] public bool? EnableDataSourceRouteCompileCache { get; set; } private readonly ISet _createTableEntities = new HashSet(); diff --git a/src/ShardingCore/Extensions/DbContextExtension.cs b/src/ShardingCore/Extensions/DbContextExtension.cs index e466b0f2..40133655 100644 --- a/src/ShardingCore/Extensions/DbContextExtension.cs +++ b/src/ShardingCore/Extensions/DbContextExtension.cs @@ -67,15 +67,6 @@ namespace ShardingCore.Extensions #endif } - /// - /// 移除所有的没有分片的表 - /// - /// - [Obsolete($"plz use {nameof(RemoveDbContextAllRelationModelThatIsNoSharding)}")] - public static void RemoveDbContextAllRelationModelThatIsNoShardingTable(this DbContext dbContext) - { - RemoveDbContextAllRelationModelThatIsNoSharding(dbContext); - } /// /// 移除所有的没有分片的表 /// diff --git a/src/ShardingCore/Sharding/ReadWriteConfigurations/ReadWriteShardingConnectionStringResolver.cs b/src/ShardingCore/Sharding/ReadWriteConfigurations/ReadWriteShardingConnectionStringResolver.cs index 4d88ac65..51a3fd3a 100644 --- a/src/ShardingCore/Sharding/ReadWriteConfigurations/ReadWriteShardingConnectionStringResolver.cs +++ b/src/ShardingCore/Sharding/ReadWriteConfigurations/ReadWriteShardingConnectionStringResolver.cs @@ -49,15 +49,20 @@ namespace ShardingCore.Sharding.ReadWriteConfigurations if (_readWriteOptions.ReadStrategy == ReadStrategyEnum.Loop) { connector= new ReadWriteLoopConnector(dataSourceName, new List { connectionString }); + _connectors.TryAdd(dataSourceName, connector); + return true; } else if (_readWriteOptions.ReadStrategy == ReadStrategyEnum.Random) { - connector= new ReadWriteLoopConnector(dataSourceName, new List { connectionString }); + connector= new ReadWriteRandomConnector(dataSourceName, new List { connectionString }); + _connectors.TryAdd(dataSourceName, connector); + return true; + } + else + { + throw new ShardingCoreInvalidOperationException( + $"unknown read write strategy:[{_readWriteOptions.ReadStrategy}]"); } - - throw new ShardingCoreInvalidOperationException( - $"unknown read write strategy:[{_readWriteOptions.ReadStrategy}]"); - } else { diff --git a/src/ShardingCore/ShardingCore.csproj b/src/ShardingCore/ShardingCore.csproj index d828a331..3a8001bb 100644 --- a/src/ShardingCore/ShardingCore.csproj +++ b/src/ShardingCore/ShardingCore.csproj @@ -4,7 +4,7 @@ $(EFCORE6) true TRACE;DEBUG;EFCORE6; - 10.0 + 9.0 https://github.com/xuejmnet/sharding-core logo.png diff --git a/src2x/ShardingCore.2x/ShardingCore.2x.csproj b/src2x/ShardingCore.2x/ShardingCore.2x.csproj index 7ea4db43..e751b7e1 100644 --- a/src2x/ShardingCore.2x/ShardingCore.2x.csproj +++ b/src2x/ShardingCore.2x/ShardingCore.2x.csproj @@ -6,7 +6,7 @@ $(EFCORE2) true TRACE;DEBUG;EFCORE2; - 10.0 + 9.0 ShardingCore ShardingCore https://github.com/xuejmnet/sharding-core diff --git a/src3x/ShardingCore.3x/ShardingCore.3x.csproj b/src3x/ShardingCore.3x/ShardingCore.3x.csproj index 2a2341b9..9b8dd757 100644 --- a/src3x/ShardingCore.3x/ShardingCore.3x.csproj +++ b/src3x/ShardingCore.3x/ShardingCore.3x.csproj @@ -6,7 +6,7 @@ $(EFCORE3) true TRACE;DEBUG;EFCORE3; - 10.0 + 9.0 ShardingCore ShardingCore https://github.com/xuejmnet/sharding-core diff --git a/src5x/ShardingCore.5x/ShardingCore.5x.csproj b/src5x/ShardingCore.5x/ShardingCore.5x.csproj index 9f0eb5cb..f0398d0b 100644 --- a/src5x/ShardingCore.5x/ShardingCore.5x.csproj +++ b/src5x/ShardingCore.5x/ShardingCore.5x.csproj @@ -5,7 +5,7 @@ $(EFCORE5) true TRACE;DEBUG;EFCORE5; - 10.0 + 9.0 ShardingCore ShardingCore https://github.com/xuejmnet/sharding-core