improve: remove useless code and upgrade dependency

dtm-labs · Apr 9, 2022 · ff01961 · ff01961
1 parent aef4a2e
commit ff01961
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 34 deletions.
diff --git a/src/DtmCommon/Barrier/BranchBarrier.cs b/src/DtmCommon/Barrier/BranchBarrier.cs
@@ -47,12 +47,7 @@ public async Task Call(DbConnection db, Func<DbTransaction, Task> busiCall)
             // check the connection state
             if (db.State != System.Data.ConnectionState.Open) await db.OpenAsync();
 
-            // All should using async method, but netstandard2.0 do not support.
-#if NETSTANDARD2_0
-            var tx = db.BeginTransaction();
-#else
             var tx = await db.BeginTransactionAsync();
-#endif
 
             try
             {
@@ -72,39 +67,26 @@ public async Task Call(DbConnection db, Func<DbTransaction, Task> busiCall)
                 if (isNullCompensation || isDuplicateOrPend)
                 {
                     Logger?.LogInformation("Will not exec busiCall, isNullCompensation={isNullCompensation}, isDuplicateOrPend={isDuplicateOrPend}", isNullCompensation, isDuplicateOrPend);
-#if NETSTANDARD2_0
-                    tx.Commit();
-#else
                     await tx.CommitAsync();
-#endif
-
                     return;
                 }
 
                 try
                 {
                     await busiCall.Invoke(tx);
                 }
-                catch 
+                catch
                 {
                     throw;
                 }
 
-#if NETSTANDARD2_0
-                tx.Commit();
-#else
                 await tx.CommitAsync();
-#endif
             }
             catch (Exception ex)
             {
                 Logger?.LogError(ex, "Call error, gid={gid}, trans_type={trans_type}", this.Gid, this.TransType);
 
-#if NETSTANDARD2_0
-                tx.Rollback();
-#else
                 await tx.RollbackAsync();
-#endif
 
                 throw;
             }

diff --git a/src/DtmCommon/DtmCommon.csproj b/src/DtmCommon/DtmCommon.csproj
@@ -6,7 +6,7 @@
 		<RepositoryUrl>https://github.com/catcherwong/dtmgrpc-csharp</RepositoryUrl>
 		<Description>a c# client for distributed transaction framework dtm. 分布式事务管理器dtm的c#客户端</Description>
 		<PackageTags>dtm,csharp,distributed transaction,tcc,saga,msg</PackageTags>
-		<VersionPrefix>1.0.0</VersionPrefix>
+		<VersionPrefix>1.1.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<Authors>catcherwong</Authors>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/src/DtmSERedisBarrier/DtmSERedisBarrier.csproj b/src/DtmSERedisBarrier/DtmSERedisBarrier.csproj
@@ -6,15 +6,15 @@
 		<RepositoryUrl>https://github.com/catcherwong/dtmgrpc-csharp</RepositoryUrl>
 		<Description>a c# client for distributed transaction framework dtm. 分布式事务管理器dtm的c#客户端</Description>
 		<PackageTags>dtm,csharp,distributed transaction,tcc,saga,msg</PackageTags>
-		<VersionPrefix>1.0.0</VersionPrefix>
+		<VersionPrefix>1.1.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<Authors>catcherwong</Authors>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.2.88" />
+    <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Dtmgrpc/Dtmgrpc.csproj b/src/Dtmgrpc/Dtmgrpc.csproj
@@ -6,7 +6,7 @@
 		<RepositoryUrl>https://github.com/catcherwong/dtmgrpc-csharp</RepositoryUrl>
 		<Description>a c# client for distributed transaction framework dtm. 分布式事务管理器dtm的c#客户端</Description>
 		<PackageTags>dtm,csharp,distributed transaction,tcc,saga,msg</PackageTags>
-		<VersionPrefix>1.0.0</VersionPrefix>
+		<VersionPrefix>1.1.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<Authors>catcherwong</Authors>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -22,9 +22,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.19.4" />
-		<PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.43.0">
+		<PackageReference Include="Google.Protobuf" Version="3.20.0" />
+		<PackageReference Include="Grpc.Net.ClientFactory" Version="2.44.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.45.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/src/Dtmgrpc/ServiceCollectionExtensions.cs b/src/Dtmgrpc/ServiceCollectionExtensions.cs
@@ -34,14 +34,14 @@ private static IServiceCollection AddDtmGrpcCore(IServiceCollection services)
             services.TryAddSingleton<Driver.IDtmDriver, Driver.DefaultDtmDriver>();
 
             // trans releate
-            services.AddSingleton<IDtmTransFactory, DtmTransFactory>();
-            services.AddSingleton<IDtmgRPCClient, DtmgRPCClient>();
-            services.AddSingleton<TccGlobalTransaction>();
+            services.TryAddSingleton<IDtmTransFactory, DtmTransFactory>();
+            services.TryAddSingleton<IDtmgRPCClient, DtmgRPCClient>();
+            services.TryAddSingleton<TccGlobalTransaction>();
 
             DtmCommon.ServiceCollectionExtensions.AddDtmCommon(services);
 
             // barrier factory
-            services.AddSingleton<IBranchBarrierFactory, DefaultBranchBarrierFactory>();
+            services.TryAddSingleton<IBranchBarrierFactory, DefaultBranchBarrierFactory>();
 
             return services;
         }

diff --git a/tests/Dtmgrpc.IntegrationTests/Dtmgrpc.IntegrationTests.csproj b/tests/Dtmgrpc.IntegrationTests/Dtmgrpc.IntegrationTests.csproj
@@ -9,13 +9,13 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="3.1.0">
+		<PackageReference Include="coverlet.collector" Version="3.1.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -27,8 +27,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.19.4" />
-		<PackageReference Include="Grpc.Tools" Version="2.43.0">
+		<PackageReference Include="Google.Protobuf" Version="3.20.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.45.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>