Update to .NET 8 preview 4

- Update to the .NET 8 preview 4 SDK. - Resolve ambiguities with `System.TimeProvider` ahead of adopting it.
App-vNext · May 17, 2023 · cbec29a · cbec29a
1 parent 87d840c
commit cbec29a
Show file tree

Hide file tree

Showing 25 changed files with 32 additions and 8 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.3.23178.7",
+    "version": "8.0.100-preview.4.23260.5",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -4,6 +4,7 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
     <PackageVersion Include="FluentAssertions" Version="6.11.0" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
@@ -23,13 +24,13 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0-preview.3.23174.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.3.23174.8" />
-    <PackageVersion Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.3.23174.8" />
-    <PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.3.23174.8" />
-    <PackageVersion Update="Microsoft.Extensions.Logging" Version="8.0.0-preview.3.23174.8" />
-    <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.3.23174.8" />
-    <PackageVersion Update="System.Threading.RateLimiting" Version="8.0.0-preview.3.23174.8" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Update="Microsoft.Extensions.Logging" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.4.23259.5" />
+    <PackageVersion Update="System.Threading.RateLimiting" Version="8.0.0-preview.4.23259.5" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework) == 'net7.0'">
     <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.0" />

diff --git a/src/Polly.Core.Tests/CircuitBreaker/Controller/AdvancedCircuitBehaviorTests.cs b/src/Polly.Core.Tests/CircuitBreaker/Controller/AdvancedCircuitBehaviorTests.cs
@@ -2,6 +2,7 @@
 using Polly.CircuitBreaker;
 using Polly.CircuitBreaker.Health;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.CircuitBreaker.Controller;
 

diff --git a/src/Polly.Core.Tests/CircuitBreaker/Health/HealthMetricsTests.cs b/src/Polly.Core.Tests/CircuitBreaker/Health/HealthMetricsTests.cs
@@ -2,6 +2,7 @@
 using Polly.CircuitBreaker;
 using Polly.CircuitBreaker.Health;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.CircuitBreaker.Health;
 

diff --git a/src/Polly.Core.Tests/Hedging/HedgingActions.cs b/src/Polly.Core.Tests/Hedging/HedgingActions.cs
@@ -1,5 +1,6 @@
 using Polly.Hedging;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Hedging;
 

diff --git a/src/Polly.Core.Tests/Hedging/HedgingTimeProvider.cs b/src/Polly.Core.Tests/Hedging/HedgingTimeProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Hedging;
 

diff --git a/src/Polly.Core.Tests/Hedging/PrimaryStringTasks.cs b/src/Polly.Core.Tests/Hedging/PrimaryStringTasks.cs
@@ -1,4 +1,5 @@
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Hedging;
 

diff --git a/src/Polly.Core.Tests/Helpers/FakeTimeProvider.cs b/src/Polly.Core.Tests/Helpers/FakeTimeProvider.cs
@@ -1,5 +1,6 @@
 using Moq;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Helpers;
 

diff --git a/src/Polly.Core.Tests/ResilienceStrategyBuilderTests.cs b/src/Polly.Core.Tests/ResilienceStrategyBuilderTests.cs
@@ -2,6 +2,7 @@
 using Moq;
 using Polly.Strategy;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests;
 

diff --git a/src/Polly.Core.Tests/Utils/SystemTimeProviderTests.cs b/src/Polly.Core.Tests/Utils/SystemTimeProviderTests.cs
@@ -1,4 +1,5 @@
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Utils;
 

diff --git a/src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs b/src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs
@@ -1,4 +1,5 @@
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Utils;
 

diff --git a/src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs b/src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs
@@ -1,4 +1,5 @@
 using Polly.Strategy;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.CircuitBreaker;
 

diff --git a/src/Polly.Core/CircuitBreaker/Health/HealthMetrics.cs b/src/Polly.Core/CircuitBreaker/Health/HealthMetrics.cs
@@ -1,4 +1,5 @@
 namespace Polly.CircuitBreaker.Health;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 /// <summary>
 /// The health metrics for advanced circuit breaker.

diff --git a/src/Polly.Core/CircuitBreaker/Health/RollingHealthMetrics.cs b/src/Polly.Core/CircuitBreaker/Health/RollingHealthMetrics.cs
@@ -1,4 +1,5 @@
 namespace Polly.CircuitBreaker.Health;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 /// <inheritdoc/>
 internal sealed class RollingHealthMetrics : HealthMetrics

diff --git a/src/Polly.Core/CircuitBreaker/Health/SingleHealthMetrics.cs b/src/Polly.Core/CircuitBreaker/Health/SingleHealthMetrics.cs
@@ -1,4 +1,5 @@
 using Polly;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.CircuitBreaker.Health;
 

diff --git a/src/Polly.Core/Hedging/Controller/HedgingController.cs b/src/Polly.Core/Hedging/Controller/HedgingController.cs
@@ -1,5 +1,6 @@
 using Polly.Hedging.Controller;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Hedging.Utils;
 

diff --git a/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs b/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
@@ -5,6 +5,7 @@
 using Polly.Strategy;
 using Polly.Utils;
 using static Polly.Hedging.Utils.HedgingExecutionContext;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Hedging.Utils;
 

diff --git a/src/Polly.Core/Hedging/HedgingResilienceStrategy.cs b/src/Polly.Core/Hedging/HedgingResilienceStrategy.cs
@@ -6,6 +6,7 @@
 using Polly.Hedging.Utils;
 using Polly.Strategy;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly;
 

diff --git a/src/Polly.Core/Hedging/HedgingResilienceStrategyBuilderExtensions.cs b/src/Polly.Core/Hedging/HedgingResilienceStrategyBuilderExtensions.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Polly.Hedging;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly;
 

diff --git a/src/Polly.Core/ResilienceStrategyBuilder.cs b/src/Polly.Core/ResilienceStrategyBuilder.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Polly.Strategy;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly;
 

diff --git a/src/Polly.Core/Retry/RetryResilienceStrategy.cs b/src/Polly.Core/Retry/RetryResilienceStrategy.cs
@@ -1,5 +1,6 @@
 using System;
 using Polly.Strategy;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Retry;
 

diff --git a/src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs b/src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs
@@ -1,4 +1,5 @@
 using Polly.Telemetry;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Strategy;
 

diff --git a/src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs b/src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Polly.Strategy;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Timeout;
 

diff --git a/src/Polly.Core/Utils/TimeProvider.cs b/src/Polly.Core/Utils/TimeProvider.cs
@@ -1,4 +1,5 @@
 using System.Threading;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Utils;
 

diff --git a/src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs b/src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs
@@ -5,6 +5,7 @@
 using Polly.Strategy;
 using Polly.Telemetry;
 using Polly.Utils;
+using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Extensions.Telemetry;