v1.8.2 - 升级依赖 FreeSql v3.2.808

2881099 · Dec 20, 2023 · 226bd75 · 226bd75
1 parent c1a0874
commit 226bd75
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/examples/net40_tcc_saga/net40_tcc_saga.csproj b/examples/net40_tcc_saga/net40_tcc_saga.csproj
@@ -49,10 +49,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FreeSql">
-      <Version>3.2.806</Version>
+      <Version>3.2.808</Version>
     </PackageReference>
     <PackageReference Include="FreeSql.Provider.Sqlite">
-      <Version>3.2.806</Version>
+      <Version>3.2.808</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/examples/net60_tcc_saga/net60_tcc_saga.csproj b/examples/net60_tcc_saga/net60_tcc_saga.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.806" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.808" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/examples/net60_webapi/net60_webapi.csproj b/examples/net60_webapi/net60_webapi.csproj
@@ -7,10 +7,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FreeSql.DbContext" Version="3.2.806" />
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.806" />
-		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.806" />
-		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.806" />
+		<PackageReference Include="FreeSql.DbContext" Version="3.2.808" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.808" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.808" />
+		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.808" />
 		<PackageReference Include="Rougamo.Fody" Version="1.1.2" />
 	</ItemGroup>
 

diff --git a/examples/netcore31_tcc_saga/netcore31_tcc_saga.csproj b/examples/netcore31_tcc_saga/netcore31_tcc_saga.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.806" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.808" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/FreeSql.Cloud/FreeSql.Cloud.csproj b/src/FreeSql.Cloud/FreeSql.Cloud.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard20;net40</TargetFrameworks>
-		<Version>1.8.1</Version>
+		<Version>1.8.2</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>提供跨数据库访问，分布式事务TCC、SAGA解决方案，支持 .NET Core 2.1+, .NET Framework 4.0+.</Description>
@@ -22,12 +22,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="../../readme.md" Pack="true" PackagePath="\"/>
+		<None Include="../../readme.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FreeSql.DbContext" Version="3.2.806" />
-		<PackageReference Include="FreeScheduler" Version="1.1.0" />
+		<PackageReference Include="FreeSql.DbContext" Version="3.2.808" />
+		<PackageReference Include="FreeScheduler" Version="2.0.18" />
 		<PackageReference Include="IdleBus" Version="1.5.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>

diff --git a/src/FreeSql.Cloud/FreeSqlCloud.cs b/src/FreeSql.Cloud/FreeSqlCloud.cs
@@ -79,7 +79,11 @@ public FreeSqlCloud(string distributeKey)
             if (string.IsNullOrWhiteSpace(DistributeKey)) DistributeKey = null;
             _ib = new IdleBus<TDBKey, IFreeSql>(TimeSpan.FromMinutes(3));
             _ib.Notice += (_, __) => { };
-            _dbkeyCurrent = new AsyncLocalAccessor<TDBKey>(() => _dbkeyMaster);
+            _dbkeyCurrent = new AsyncLocalAccessor<TDBKey>(() =>
+            {
+                if (typeof(TDBKey) == typeof(string) && _dbkeyMaster == null) return (TDBKey)typeof(TDBKey).FromObject("");
+                return _dbkeyMaster;
+            });
 		}
 
         /// <summary>