From f69428880336a186aa24715a7a1a0c02b73d8cea Mon Sep 17 00:00:00 2001 From: Wilfried Kirschenmann <17836122+wkirschenmann@users.noreply.github.com> Date: Wed, 23 Aug 2023 12:20:24 +0200 Subject: [PATCH] Restore language version 10 --- Client/src/Common/Submitter/ApiExt/GrpcArmoniKClient.cs | 7 ++----- Client/src/Common/Submitter/ApiExt/RetryArmoniKClient.cs | 6 +----- Directory.Build.props | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Client/src/Common/Submitter/ApiExt/GrpcArmoniKClient.cs b/Client/src/Common/Submitter/ApiExt/GrpcArmoniKClient.cs index 754e5c6a..692bb168 100644 --- a/Client/src/Common/Submitter/ApiExt/GrpcArmoniKClient.cs +++ b/Client/src/Common/Submitter/ApiExt/GrpcArmoniKClient.cs @@ -410,11 +410,8 @@ internal static void ValidateRetryArguments(int maxRetries, if (maxRetries != 1 || totalTimeoutMs != 1e10) { throw new ArgumentOutOfRangeException(nameof(maxRetries), - $""" - {nameof(GrpcArmoniKClient)} has no retry policy and only support a single call. - {maxRetries} must be equal to 1. - {totalTimeoutMs} must be equal to 1e10 ({1e10}). - """); + $"{nameof(GrpcArmoniKClient)} has no retry policy and only support a single call.\r\n" + + $"{maxRetries} must be equal to 1.\r\n" + $"{totalTimeoutMs} must be equal to 1e10 ({1e10})."); } } } diff --git a/Client/src/Common/Submitter/ApiExt/RetryArmoniKClient.cs b/Client/src/Common/Submitter/ApiExt/RetryArmoniKClient.cs index 515d66ed..e7b73792 100644 --- a/Client/src/Common/Submitter/ApiExt/RetryArmoniKClient.cs +++ b/Client/src/Common/Submitter/ApiExt/RetryArmoniKClient.cs @@ -244,11 +244,7 @@ internal async Task ApplyRetryPolicy(Func> acti if (policyResult.Outcome == OutcomeType.Failure) { - throw new ArmoniKException($""" - Call to {callerName} failed the retry policy. - Reason is: {policyResult.FaultType}. - See previous log for details. - """, + throw new ArmoniKException($"Call to {callerName} failed the retry policy.\r\nReason is: {policyResult.FaultType}.\r\nSee previous log for details.", policyResult.FinalException); } diff --git a/Directory.Build.props b/Directory.Build.props index a773d54e..07e56ff0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -67,7 +67,7 @@ true enable - 11 + 10