Merge branch 'main' into zombach/remove-warning-s3246

App-vNext · Jul 18, 2024 · 5ee86cf · 5ee86cf
2 parents f25e762 + f3bad33
commit 5ee86cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Polly/Polly.csproj b/src/Polly/Polly.csproj
@@ -8,7 +8,7 @@
     <MutationScore>70</MutationScore>
     <IncludePollyUsings>true</IncludePollyUsings>
     <NoWarn>$(NoWarn);CA1010;CA1031;CA1051;CA1062;CA1063;CA1064;CA1710;CA1716;CA1724;CA1805;CA1815;CA1816;CA2211</NoWarn>
-    <NoWarn>$(NoWarn);S2223;S3215;S3971;S4039;S4457</NoWarn>
+    <NoWarn>$(NoWarn);S2223;S3215;S4039;S4457</NoWarn>
     <!--Public API Analyzers: We do not need to fix these as it would break compatibility with released Polly versions-->
     <NoWarn>$(NoWarn);RS0037;</NoWarn>
   </PropertyGroup>

diff --git a/src/Polly/Utilities/TimedLock.cs b/src/Polly/Utilities/TimedLock.cs
@@ -32,7 +32,9 @@ private static TimedLock Lock(object o, TimeSpan timeout)
         if (!Monitor.TryEnter(o, timeout))
         {
 #if DEBUG
+#pragma warning disable S3971 // Do not call 'GC.SuppressFinalize'
             GC.SuppressFinalize(tl._leakDetector);
+#pragma warning restore S3971
 #endif
             throw new LockTimeoutException();
         }