Skip to content

Commit deb5087

Browse files
Fix SA1108 and SA1118 (#2148)
Remove SA1108 and SA1118 from `NoWarn` list.
1 parent 7b971f5 commit deb5087

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Diff for: src/Polly/Polly.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<IncludePollyUsings>true</IncludePollyUsings>
1010
<NoWarn>$(NoWarn);CA1010;CA1031;CA1032;CA1033;CA1051;CA1062;CA1063;CA1064;CA1068;CA1710;CA1716;CA1724;CA1805;CA1815;CA1816;CA2211</NoWarn>
1111
<NoWarn>$(NoWarn);S2223;S3215;S3246;S3971;S4039;S4049;S4457</NoWarn>
12-
<NoWarn>$(NoWarn);SA1108;SA1118;SA1414</NoWarn>
12+
<NoWarn>$(NoWarn);SA1414</NoWarn>
1313
<!--Public API Analyzers: We do not need to fix these as it would break compatibility with released Polly versions-->
1414
<NoWarn>$(NoWarn);RS0037;</NoWarn>
1515
</PropertyGroup>

Diff for: src/Polly/Timeout/TimeoutEngine.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ internal static TResult Implementation<TResult>(
4646
*/
4747
actionTask.Wait(timeoutCancellationTokenSource.Token);
4848
}
49-
catch (AggregateException ex) when (ex.InnerExceptions.Count == 1) // Issue #270. Unwrap extra AggregateException caused by the way pessimistic timeout policy for synchronous executions is necessarily constructed.
49+
catch (AggregateException ex) when (ex.InnerExceptions.Count == 1)
5050
{
51+
// Issue #270. Unwrap extra AggregateException caused by the way pessimistic timeout policy for synchronous executions is necessarily constructed.
5152
ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
5253
}
5354

0 commit comments

Comments
 (0)