From 2f02be7f4474e37d882688788e9969b6ca8e2e46 Mon Sep 17 00:00:00 2001
From: Martin Costello <martin@martincostello.com>
Date: Fri, 16 May 2025 14:16:12 +0100
Subject: [PATCH 1/2] .NET 10 preparation

- Fix IDE0055 warning.
- Remove redundant MSBuild property.
---
 Directory.Packages.props                  | 1 -
 src/Polly.Core/Utils/DefaultPredicates.cs | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 09e3aa72f02..aa06f1b1262 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,7 +6,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
     <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
-    <MicrosoftExtensionsTimeProviderVersion>9.0.0</MicrosoftExtensionsTimeProviderVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
diff --git a/src/Polly.Core/Utils/DefaultPredicates.cs b/src/Polly.Core/Utils/DefaultPredicates.cs
index fdbcb3efa55..651835a95b4 100644
--- a/src/Polly.Core/Utils/DefaultPredicates.cs
+++ b/src/Polly.Core/Utils/DefaultPredicates.cs
@@ -1,4 +1,5 @@
 namespace Polly.Utils;
+
 internal static class DefaultPredicates<TArgs, TResult>
     where TArgs : IOutcomeArguments<TResult>
 {
@@ -6,6 +7,6 @@ internal static class DefaultPredicates<TArgs, TResult>
     {
         OperationCanceledException => PredicateResult.False(),
         Exception => PredicateResult.True(),
-        _ => PredicateResult.False()
+        _ => PredicateResult.False(),
     };
 }

From 6b166d76d6417c5d6f74fd2222b41ccf80d80b01 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Fri, 16 May 2025 09:24:06 -0400
Subject: [PATCH 2/2] Fix IDE0055 warnings

Fix more IDE0055 warnings from #2531.
---
 test/Polly.Core.Tests/OutcomeTests.cs                            | 1 +
 .../Registry/ResiliencePipelineRegistryOptionsTests.cs           | 1 +
 test/Polly.Core.Tests/Simmy/ChaosStrategyOptionsTests.cs         | 1 +
 test/Polly.Core.Tests/Timeout/TimeoutUtilTests.cs                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/test/Polly.Core.Tests/OutcomeTests.cs b/test/Polly.Core.Tests/OutcomeTests.cs
index c2a3ccbb8eb..43dee82a5e8 100644
--- a/test/Polly.Core.Tests/OutcomeTests.cs
+++ b/test/Polly.Core.Tests/OutcomeTests.cs
@@ -1,4 +1,5 @@
 namespace Polly.Core.Tests;
+
 public class OutcomeTests
 {
     [Fact]
diff --git a/test/Polly.Core.Tests/Registry/ResiliencePipelineRegistryOptionsTests.cs b/test/Polly.Core.Tests/Registry/ResiliencePipelineRegistryOptionsTests.cs
index a373b6b27ac..df8fa2d596d 100644
--- a/test/Polly.Core.Tests/Registry/ResiliencePipelineRegistryOptionsTests.cs
+++ b/test/Polly.Core.Tests/Registry/ResiliencePipelineRegistryOptionsTests.cs
@@ -1,6 +1,7 @@
 using Polly.Registry;
 
 namespace Polly.Core.Tests.Registry;
+
 public class ResiliencePipelineRegistryOptionsTests
 {
     [Fact]
diff --git a/test/Polly.Core.Tests/Simmy/ChaosStrategyOptionsTests.cs b/test/Polly.Core.Tests/Simmy/ChaosStrategyOptionsTests.cs
index ca201c04ae0..519d58f1c37 100644
--- a/test/Polly.Core.Tests/Simmy/ChaosStrategyOptionsTests.cs
+++ b/test/Polly.Core.Tests/Simmy/ChaosStrategyOptionsTests.cs
@@ -3,6 +3,7 @@
 using Polly.Utils;
 
 namespace Polly.Core.Tests.Simmy;
+
 public class ChaosStrategyOptionsTests
 {
     [Fact]
diff --git a/test/Polly.Core.Tests/Timeout/TimeoutUtilTests.cs b/test/Polly.Core.Tests/Timeout/TimeoutUtilTests.cs
index 7c5da919c75..1e68e1e2071 100644
--- a/test/Polly.Core.Tests/Timeout/TimeoutUtilTests.cs
+++ b/test/Polly.Core.Tests/Timeout/TimeoutUtilTests.cs
@@ -1,6 +1,7 @@
 using Polly.Timeout;
 
 namespace Polly.Core.Tests.Timeout;
+
 public class TimeoutUtilTests
 {
     public static readonly TheoryData<TimeSpan, bool> ShouldApplyTimeoutData = new()