7.x.0.12

xuejmnet · xuejmnet · commit a1ca244ccb8a · 2022-12-23T15:20:36.000+08:00
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,10 +1,10 @@
 :start
 ::定义版本
-set EFCORE7=7.7.0.9
-set EFCORE6=7.6.0.9
-set EFCORE5=7.5.0.9
-set EFCORE3=7.3.0.9
-set EFCORE2=7.2.0.9
+set EFCORE7=7.7.0.12
+set EFCORE6=7.6.0.12
+set EFCORE5=7.5.0.12
+set EFCORE3=7.3.0.12
+set EFCORE2=7.2.0.12
 
 ::删除所有bin与obj下的文件
 @echo off
diff --git a/src/ShardingCore/Extensions/DbContextExtensions/DbContextExtensionShardingCore.cs b/src/ShardingCore/Extensions/DbContextExtensions/DbContextExtensionShardingCore.cs
@@ -146,7 +146,7 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(
             var shardingRuntimeContext = dbContext.GetShardingRuntimeContext();
             var entityMetadataManager = shardingRuntimeContext.GetEntityMetadataManager();
 
-#if EFCORE6
+#if EFCORE6 || EFCORE7
             var entityTypes = contextModel.GetEntityTypes();
             foreach (var entityType in entityTypes)
             {
@@ -156,8 +156,17 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(
                 }
             }
             var contextModelRelationalModel = contextModel.GetRelationalModel() as RelationalModel;
+            foreach (var keyValuePair in contextModelRelationalModel.Tables)
+            {
+                foreach (var valueEntityTypeMapping in keyValuePair.Value.EntityTypeMappings)
+                {
+                    var x = !entityMetadataManager.IsOnlyShardingDataSource(valueEntityTypeMapping.EntityType.ClrType);
+                    Console.WriteLine(valueEntityTypeMapping.EntityType.ClrType);
+                    Console.WriteLine(x);
+                }
+            }
             var valueTuples =
-                contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsShardingDataSource(m.EntityType.ClrType) ||entityMetadataManager.TryGet(m.EntityType.ClrType)==null)).Select(o => o.Key).ToList();
+                contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsOnlyShardingDataSource(m.EntityType.ClrType))).Select(o => o.Key).ToList();
             for (int i = 0; i < valueTuples.Count; i++)
             {
                 contextModelRelationalModel.Tables.Remove(valueTuples[i]);
@@ -174,7 +183,7 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(
             }
             var contextModelRelationalModel = contextModel.RelationalModel as RelationalModel;
             var valueTuples =
- contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsShardingDataSource(m.EntityType.ClrType)||entityMetadataManager.TryGet(m.EntityType.ClrType)==null)).Select(o => o.Key).ToList();
+ contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsOnlyShardingDataSource(m.EntityType.ClrType))).Select(o => o.Key).ToList();
             for (int i = 0; i < valueTuples.Count; i++)
             {
                 contextModelRelationalModel.Tables.Remove(valueTuples[i]);
@@ -191,7 +200,7 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(
                     _data.Clear();
                 }
             }
-            var list = entityTypes.Where(o => !entityMetadataManager.IsShardingDataSource(o.Value.ClrType) || entityMetadataManager.TryGet(o.Value.ClrType) == null).Select(o => o.Key).ToList();
+            var list = entityTypes.Where(o => !entityMetadataManager.IsOnlyShardingDataSource(o.Value.ClrType)).Select(o => o.Key).ToList();
             for (int i = 0; i < list.Count; i++)
             {
                 entityTypes.Remove(list[i]);
@@ -216,7 +225,7 @@ public static void RemoveDbContextAllRelationModel(this DbContext dbContext)
             var contextModel = dbContext.Model as Model;
 #endif
 
-#if EFCORE6
+#if EFCORE6|| EFCORE7
             var contextModelRelationalModel = contextModel.GetRelationalModel() as RelationalModel;
             contextModelRelationalModel.Tables.Clear();
 #endif
diff --git a/src/ShardingCore/ShardingCore.csproj b/src/ShardingCore/ShardingCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-        <Version>7.7.0.11</Version>
+        <Version>$(EFCORE7)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE7;</DefineConstants>
         <LangVersion>latest</LangVersion>
diff --git a/src2/ShardingCore2/ShardingCore2.csproj b/src2/ShardingCore2/ShardingCore2.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>7.2.0.11</Version>
+        <Version>$(EFCORE2)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE2;</DefineConstants>
         <LangVersion>9.0</LangVersion>
diff --git a/src3/ShardingCore3/ShardingCore3.csproj b/src3/ShardingCore3/ShardingCore3.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>7.3.0.11</Version>
+        <Version>$(EFCORE3)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE3;</DefineConstants>
         <LangVersion>9.0</LangVersion>
diff --git a/src5/ShardingCore5/ShardingCore5.csproj b/src5/ShardingCore5/ShardingCore5.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>7.5.0.11</Version>
+        <Version>$(EFCORE5)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE5;</DefineConstants>
         <LangVersion>9.0</LangVersion>
diff --git a/src6/ShardingCore6/ShardingCore6.csproj b/src6/ShardingCore6/ShardingCore6.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>7.6.0.11</Version>
+        <Version>$(EFCORE6)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE6;</DefineConstants>
         <LangVersion>9.0</LangVersion>

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(`
`146`	`146`	`var shardingRuntimeContext = dbContext.GetShardingRuntimeContext();`
`147`	`147`	`var entityMetadataManager = shardingRuntimeContext.GetEntityMetadataManager();`
`148`	`148`
`149`		`-#if EFCORE6`
	`149`	`+#if EFCORE6 \|\| EFCORE7`
`150`	`150`	`var entityTypes = contextModel.GetEntityTypes();`
`151`	`151`	`foreach (var entityType in entityTypes)`
`152`	`152`	`{`
`@@ -156,8 +156,17 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`	`var contextModelRelationalModel = contextModel.GetRelationalModel() as RelationalModel;`
	`159`	`+ foreach (var keyValuePair in contextModelRelationalModel.Tables)`
	`160`	`+ {`
	`161`	`+ foreach (var valueEntityTypeMapping in keyValuePair.Value.EntityTypeMappings)`
	`162`	`+ {`
	`163`	`+ var x = !entityMetadataManager.IsOnlyShardingDataSource(valueEntityTypeMapping.EntityType.ClrType);`
	`164`	`+ Console.WriteLine(valueEntityTypeMapping.EntityType.ClrType);`
	`165`	`+ Console.WriteLine(x);`
	`166`	`+ }`
	`167`	`+ }`
`159`	`168`	`var valueTuples =`
`160`		`- contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsShardingDataSource(m.EntityType.ClrType) \|\|entityMetadataManager.TryGet(m.EntityType.ClrType)==null)).Select(o => o.Key).ToList();`
	`169`	`+ contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsOnlyShardingDataSource(m.EntityType.ClrType))).Select(o => o.Key).ToList();`
`161`	`170`	`for (int i = 0; i < valueTuples.Count; i++)`
`162`	`171`	`{`
`163`	`172`	`contextModelRelationalModel.Tables.Remove(valueTuples[i]);`
`@@ -174,7 +183,7 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(`
`174`	`183`	`}`
`175`	`184`	`var contextModelRelationalModel = contextModel.RelationalModel as RelationalModel;`
`176`	`185`	`var valueTuples =`
`177`		`- contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsShardingDataSource(m.EntityType.ClrType)\|\|entityMetadataManager.TryGet(m.EntityType.ClrType)==null)).Select(o => o.Key).ToList();`
	`186`	`+ contextModelRelationalModel.Tables.Where(o => o.Value.EntityTypeMappings.Any(m => !entityMetadataManager.IsOnlyShardingDataSource(m.EntityType.ClrType))).Select(o => o.Key).ToList();`
`178`	`187`	`for (int i = 0; i < valueTuples.Count; i++)`
`179`	`188`	`{`
`180`	`189`	`contextModelRelationalModel.Tables.Remove(valueTuples[i]);`
`@@ -191,7 +200,7 @@ public static void RemoveDbContextAllRelationModelWithoutShardingDataSourceOnly(`
`191`	`200`	`_data.Clear();`
`192`	`201`	`}`
`193`	`202`	`}`
`194`		`- var list = entityTypes.Where(o => !entityMetadataManager.IsShardingDataSource(o.Value.ClrType) \|\| entityMetadataManager.TryGet(o.Value.ClrType) == null).Select(o => o.Key).ToList();`
	`203`	`+ var list = entityTypes.Where(o => !entityMetadataManager.IsOnlyShardingDataSource(o.Value.ClrType)).Select(o => o.Key).ToList();`
`195`	`204`	`for (int i = 0; i < list.Count; i++)`
`196`	`205`	`{`
`197`	`206`	`entityTypes.Remove(list[i]);`
`@@ -216,7 +225,7 @@ public static void RemoveDbContextAllRelationModel(this DbContext dbContext)`
`216`	`225`	`var contextModel = dbContext.Model as Model;`
`217`	`226`	`#endif`
`218`	`227`
`219`		`-#if EFCORE6`
	`228`	`+#if EFCORE6\|\| EFCORE7`
`220`	`229`	`var contextModelRelationalModel = contextModel.GetRelationalModel() as RelationalModel;`
`221`	`230`	`contextModelRelationalModel.Tables.Clear();`
`222`	`231`	`#endif`