From bb8c0a97627a972303c39ece2bade0d8d5b4b2d5 Mon Sep 17 00:00:00 2001 From: Catcher Wong Date: Thu, 23 Mar 2023 22:43:16 +0800 Subject: [PATCH] update dependencies version and custom options (#65) --- build/dependencies.props | 26 ++++++++++--------- .../DtmOnDaprSample/DtmOnDaprSample.csproj | 8 +++--- samples/DtmSample/DtmSample.csproj | 8 +++--- src/DtmCommon/DtmCommon.csproj | 2 +- src/Dtmcli/Msg/Msg.cs | 4 +-- src/Dtmcli/Saga/Saga.cs | 14 ++++++---- src/Dtmgrpc/Msg/MsgGrpc.cs | 4 +-- src/Dtmgrpc/Saga/SagaGrpc.cs | 13 +++++++--- 8 files changed, 45 insertions(+), 34 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e56e9b0..716c684 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,11 +2,11 @@ 2.0.123 - 6.0.2 + 6.0.7 6.0.0 6.0.0 6.0.0 - 7.0.0 + 7.0.2 7.0.0 7.0.0 7.0.0 @@ -16,25 +16,27 @@ 6.0.0 - 3.21.9 - 2.50.0 - 2.50.0 + 3.22.1 + 2.52.0 + 2.52.0 - 2.18.0 - 2.5.61 + 2.19.0 + 2.6.96 - - 2.50.0 - 2.2.1 - 17.4.0 - 4.18.2 + + 2.52.0 + 2.2.5 + 17.5.0 + 4.18.4 2.4.2 2.4.5 3.2.0 7.0.0 1.22.0 + 5.1.0 + 6.5.0 diff --git a/samples/DtmOnDaprSample/DtmOnDaprSample.csproj b/samples/DtmOnDaprSample/DtmOnDaprSample.csproj index 6d5de41..2047817 100644 --- a/samples/DtmOnDaprSample/DtmOnDaprSample.csproj +++ b/samples/DtmOnDaprSample/DtmOnDaprSample.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/samples/DtmSample/DtmSample.csproj b/samples/DtmSample/DtmSample.csproj index 8778725..85b299f 100644 --- a/samples/DtmSample/DtmSample.csproj +++ b/samples/DtmSample/DtmSample.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/src/DtmCommon/DtmCommon.csproj b/src/DtmCommon/DtmCommon.csproj index a625b05..09e5a71 100644 --- a/src/DtmCommon/DtmCommon.csproj +++ b/src/DtmCommon/DtmCommon.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/Dtmcli/Msg/Msg.cs b/src/Dtmcli/Msg/Msg.cs index cd980c8..520127a 100644 --- a/src/Dtmcli/Msg/Msg.cs +++ b/src/Dtmcli/Msg/Msg.cs @@ -48,7 +48,7 @@ public async Task Prepare(string queryPrepared, CancellationToken cancellationTo public async Task Submit(CancellationToken cancellationToken = default) { - this.BuildCustimOptions(); + this.BuildCustomOptions(); await this._dtmClient.TransCallDtm(this._transBase, this._transBase, Constant.Request.OPERATION_SUBMIT, cancellationToken); } @@ -153,7 +153,7 @@ public Msg SetDelay(long delay) return this; } - private void BuildCustimOptions() + private void BuildCustomOptions() { if (this._delay > 0) { diff --git a/src/Dtmcli/Saga/Saga.cs b/src/Dtmcli/Saga/Saga.cs index 25d47ad..ba581c3 100644 --- a/src/Dtmcli/Saga/Saga.cs +++ b/src/Dtmcli/Saga/Saga.cs @@ -44,11 +44,7 @@ public Saga EnableConcurrent() public async Task Submit(CancellationToken cancellationToken = default) { - if (this._concurrent) - { - this._transBase.CustomData = JsonSerializer.Serialize(new { orders = this._orders, concurrent = this._concurrent }); - } - + this.BuildCustomOptions(); await _dtmClient.TransCallDtm(this._transBase, this._transBase, Constant.Request.OPERATION_SUBMIT, cancellationToken).ConfigureAwait(false); } @@ -107,5 +103,13 @@ public Saga SetRetryLimit(long limit) this._transBase.RetryLimit = limit; return this; } + + private void BuildCustomOptions() + { + if (this._concurrent) + { + this._transBase.CustomData = JsonSerializer.Serialize(new { orders = this._orders, concurrent = this._concurrent }); + } + } } } diff --git a/src/Dtmgrpc/Msg/MsgGrpc.cs b/src/Dtmgrpc/Msg/MsgGrpc.cs index d995d38..7bfefa2 100644 --- a/src/Dtmgrpc/Msg/MsgGrpc.cs +++ b/src/Dtmgrpc/Msg/MsgGrpc.cs @@ -52,7 +52,7 @@ public async Task Prepare(string queryPrepared, CancellationToken cancellationTo public async Task Submit(CancellationToken cancellationToken = default) { - this.BuildCustimOptions(); + this.BuildCustomOptions(); await this._dtmClient.DtmGrpcCall(this._transBase, Constant.Op.Submit); } @@ -164,7 +164,7 @@ public MsgGrpc SetDelay(long delay) return this; } - private void BuildCustimOptions() + private void BuildCustomOptions() { if (this._delay > 0) { diff --git a/src/Dtmgrpc/Saga/SagaGrpc.cs b/src/Dtmgrpc/Saga/SagaGrpc.cs index 6d6ae16..cfd4019 100644 --- a/src/Dtmgrpc/Saga/SagaGrpc.cs +++ b/src/Dtmgrpc/Saga/SagaGrpc.cs @@ -47,10 +47,7 @@ public SagaGrpc EnableConcurrent() public async Task Submit() { - if (this._concurrent) - { - this._transBase.CustomData = Utils.ToJsonString(new { orders = this._orders, concurrent = this._concurrent }); - } + this.BuildCustimOptions(); await _dtmClient.DtmGrpcCall(this._transBase, Constant.Op.Submit).ConfigureAwait(false); } @@ -110,5 +107,13 @@ public SagaGrpc SetRetryLimit(long limit) this._transBase.RetryLimit = limit; return this; } + + private void BuildCustimOptions() + { + if (this._concurrent) + { + this._transBase.CustomData = Utils.ToJsonString(new { orders = this._orders, concurrent = this._concurrent }); + } + } } }