diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 33cbc8cbd8e..1fc2ecd3bed 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,6 +10,9 @@ updates:
 - package-ecosystem: nuget
   directory: "/"
   groups:
+    polly:
+      patterns:
+        - Polly*
     xunit:
       patterns:
         - xunit*
diff --git a/Directory.Build.props b/Directory.Build.props
index 8fa466d35af..b9da96c4e8f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <UseArtifactsOutput>true</UseArtifactsOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(CI)' == 'true' ">
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8505f80d338..9bfaa6cf565 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,12 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <PollyVersion>8.6.2</PollyVersion>
-    <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
-    <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
-  </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
     <PackageVersion Include="Cake.FileHelpers" Version="7.0.0" />
@@ -17,29 +9,25 @@
     <PackageVersion Include="IcedTasks" Version="0.11.4" />
     <PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.7.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="Polly" Version="$(PollyVersion)" />
+    <PackageVersion Include="Polly" Version="8.6.2" />
     <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
-    <PackageVersion Include="Polly.Core" Version="$(PollyVersion)" />
-    <PackageVersion Include="Polly.Extensions" Version="$(PollyVersion)" />
-    <PackageVersion Include="Polly.RateLimiting" Version="$(PollyVersion)" />
-    <PackageVersion Include="Polly.Testing" Version="$(PollyVersion)" />
+    <PackageVersion Include="Polly.Core" Version="8.6.2" />
+    <PackageVersion Include="Polly.Extensions" Version="8.6.2" />
+    <PackageVersion Include="Polly.RateLimiting" Version="8.6.2" />
+    <PackageVersion Include="Polly.Testing" Version="8.6.2" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
     <PackageVersion Include="ReportGenerator" Version="5.4.8" />
     <PackageVersion Include="RestSharp" Version="112.1.0" />
@@ -47,12 +35,27 @@
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.12.0.118525" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="System.Text.Json" Version="9.0.7" />
-    <PackageVersion Include="System.Threading.RateLimiting" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
   </ItemGroup>
+  <!-- Dependencies below are pinned for the libraries we ship to NuGet.org -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
+    <PackageVersion Update="Microsoft.Bcl.TimeProvider" Version="9.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
+    <PackageVersion Update="System.Threading.RateLimiting" Version="9.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/samples/Chaos/Chaos.csproj b/samples/Chaos/Chaos.csproj
index 135449de97e..e56f9d3b33b 100644
--- a/samples/Chaos/Chaos.csproj
+++ b/samples/Chaos/Chaos.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Chaos</RootNamespace>
   </PropertyGroup>
 
diff --git a/samples/DependencyInjection/DependencyInjection.csproj b/samples/DependencyInjection/DependencyInjection.csproj
index f73ecdbafb0..4c52a3cd20d 100644
--- a/samples/DependencyInjection/DependencyInjection.csproj
+++ b/samples/DependencyInjection/DependencyInjection.csproj
@@ -3,13 +3,11 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Polly.Extensions" />
   </ItemGroup>
 
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 65ffeb1be98..5ffa04e7612 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -1,14 +1,17 @@
 <Project>
 
   <PropertyGroup>
-    <RunAnalyzers>true</RunAnalyzers>
-    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <AnalysisLevel>latest</AnalysisLevel>
-    <ProjectType>Library</ProjectType>
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <NoWarn>$(NoWarn);SA1123;SA1515;CA2000;CA2007;CA1303;IDE0021;RS0037;RS0016;CS1591</NoWarn>
-    <EnablePackageValidation>false</EnablePackageValidation>
+    <Nullable>enable</Nullable>
+    <ProjectType>Library</ProjectType>
+    <RunAnalyzers>true</RunAnalyzers>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
   </PropertyGroup>
 
   <Import Project="$(MsBuildThisFileDirectory)..\eng\Library.targets" />
diff --git a/samples/Extensibility/Extensibility.csproj b/samples/Extensibility/Extensibility.csproj
index 49e230a9337..051a66db64e 100644
--- a/samples/Extensibility/Extensibility.csproj
+++ b/samples/Extensibility/Extensibility.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/GenericPipelines/GenericPipelines.csproj b/samples/GenericPipelines/GenericPipelines.csproj
index caa321690bb..023769f2e30 100644
--- a/samples/GenericPipelines/GenericPipelines.csproj
+++ b/samples/GenericPipelines/GenericPipelines.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Intro.FSharp/Intro.FSharp.fsproj b/samples/Intro.FSharp/Intro.FSharp.fsproj
index 414975d92eb..89b253d4a00 100644
--- a/samples/Intro.FSharp/Intro.FSharp.fsproj
+++ b/samples/Intro.FSharp/Intro.FSharp.fsproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Intro.FSharp/Program.fs b/samples/Intro.FSharp/Program.fs
index f7b7ca02216..666de749bb7 100644
--- a/samples/Intro.FSharp/Program.fs
+++ b/samples/Intro.FSharp/Program.fs
@@ -18,7 +18,7 @@ let demo () =
         // and for both void and result-returning user-callbacks.
         let pipeline =
             ResiliencePipelineBuilder()
-                .AddTimeout(TimeSpan.FromSeconds(5))
+                .AddTimeout(TimeSpan.FromSeconds(5.0))
                 .Build()
 
         let token = CancellationToken.None
diff --git a/samples/Intro.VisualBasic/Intro.VisualBasic.vbproj b/samples/Intro.VisualBasic/Intro.VisualBasic.vbproj
index 499481d3d4e..051a66db64e 100644
--- a/samples/Intro.VisualBasic/Intro.VisualBasic.vbproj
+++ b/samples/Intro.VisualBasic/Intro.VisualBasic.vbproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Intro/Intro.csproj b/samples/Intro/Intro.csproj
index 49e230a9337..051a66db64e 100644
--- a/samples/Intro/Intro.csproj
+++ b/samples/Intro/Intro.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Retries/Retries.csproj b/samples/Retries/Retries.csproj
index 49e230a9337..051a66db64e 100644
--- a/samples/Retries/Retries.csproj
+++ b/samples/Retries/Retries.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs b/test/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs
index 7c66704ee13..8cae859abf9 100644
--- a/test/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs
+++ b/test/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs
@@ -2,7 +2,6 @@
 using Polly.Retry;
 using Polly.Telemetry;
 using Polly.Testing;
-using Xunit.Sdk;
 
 namespace Polly.Core.Tests.Retry;
 
@@ -256,7 +255,7 @@ public async Task RetryDelayGenerator_ZeroDelay_NoTimeProviderCalls()
         int generatedValues = 0;
 
         var delay = TimeSpan.Zero;
-        var provider = new ThrowingFakeTimeProvider();
+        var provider = new FakeTimeProvider();
 
         _options.ShouldHandle = _ => PredicateResult.True();
         _options.MaxRetryAttempts = 3;
@@ -289,14 +288,6 @@ public void IsLastAttempt_Ok()
         increment.ShouldBeFalse();
     }
 
-    private sealed class ThrowingFakeTimeProvider : FakeTimeProvider
-    {
-        public override DateTimeOffset GetUtcNow() => throw new XunitException("TimeProvider should not be used.");
-
-        public override ITimer CreateTimer(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
-            => throw new XunitException("TimeProvider should not be used.");
-    }
-
     [Fact]
     public async Task OnRetry_EnsureCorrectArguments()
     {