From f953a966c228c092fe4608ef7e37ebbfdba8b0e0 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Fri, 27 Oct 2023 17:56:56 +0100
Subject: [PATCH] Update compatibility suppressions

Resolve CP0001 and CP0002 warnings with the .NET 8 SDK.
---
 src/Polly.Core/CompatibilitySuppressions.xml |  12 --
 src/Polly/CompatibilitySuppressions.xml      | 129 +------------------
 2 files changed, 2 insertions(+), 139 deletions(-)

diff --git a/src/Polly.Core/CompatibilitySuppressions.xml b/src/Polly.Core/CompatibilitySuppressions.xml
index a5bb6e45765..ac7575c1ecd 100644
--- a/src/Polly.Core/CompatibilitySuppressions.xml
+++ b/src/Polly.Core/CompatibilitySuppressions.xml
@@ -7,12 +7,6 @@
     <Left>lib/netstandard2.0/Polly.Core.dll</Left>
     <Right>lib/net6.0/Polly.Core.dll</Right>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Polly.CircuitBreaker.BrokenCircuitException`1.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
-    <Left>lib/netstandard2.0/Polly.Core.dll</Left>
-    <Right>lib/net6.0/Polly.Core.dll</Right>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Polly.CircuitBreaker.IsolatedCircuitException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
@@ -25,10 +19,4 @@
     <Left>lib/netstandard2.0/Polly.Core.dll</Left>
     <Right>lib/net6.0/Polly.Core.dll</Right>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Polly.Timeout.TimeoutRejectedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
-    <Left>lib/netstandard2.0/Polly.Core.dll</Left>
-    <Right>lib/net6.0/Polly.Core.dll</Right>
-  </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/src/Polly/CompatibilitySuppressions.xml b/src/Polly/CompatibilitySuppressions.xml
index e76772a16fc..d28f11e4c64 100644
--- a/src/Polly/CompatibilitySuppressions.xml
+++ b/src/Polly/CompatibilitySuppressions.xml
@@ -1,132 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.BrokenCircuitException</Target>
-    <Left>lib/net461/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.BrokenCircuitException`1</Target>
-    <Left>lib/net461/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.CircuitState</Target>
-    <Left>lib/net461/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.IsolatedCircuitException</Target>
-    <Left>lib/net461/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.ExecutionRejectedException</Target>
-    <Left>lib/net461/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.Timeout.TimeoutRejectedException</Target>
-    <Left>lib/net461/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.BrokenCircuitException</Target>
-    <Left>lib/net472/Polly.dll</Left>
-    <Right>lib/net472/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.BrokenCircuitException`1</Target>
-    <Left>lib/net472/Polly.dll</Left>
-    <Right>lib/net472/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.CircuitState</Target>
-    <Left>lib/net472/Polly.dll</Left>
-    <Right>lib/net472/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.IsolatedCircuitException</Target>
-    <Left>lib/net472/Polly.dll</Left>
-    <Right>lib/net472/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.ExecutionRejectedException</Target>
-    <Left>lib/net472/Polly.dll</Left>
-    <Right>lib/net472/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.Timeout.TimeoutRejectedException</Target>
-    <Left>lib/net472/Polly.dll</Left>
-    <Right>lib/net472/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.BrokenCircuitException</Target>
-    <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.BrokenCircuitException`1</Target>
-    <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.CircuitState</Target>
-    <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.CircuitBreaker.IsolatedCircuitException</Target>
-    <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.ExecutionRejectedException</Target>
-    <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Polly.Timeout.TimeoutRejectedException</Target>
-    <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/netstandard2.0/Polly.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Polly.Bulkhead.BulkheadRejectedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
@@ -179,7 +53,8 @@
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Polly.Timeout.TimeoutRejectedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
     <Left>lib/netstandard2.0/Polly.dll</Left>
-    <Right>lib/net6.0/Polly.dll</Right>
+    <Right>lib/netstandard2.0/Polly.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>PKV006</DiagnosticId>