Drop custom validation attributes

src/Polly.Core/CircuitBreaker/AdvancedCircuitBreakerStrategyOptions.TResult.cs

@@ -52,6 +52,6 @@ public class AdvancedCircuitBreakerStrategyOptions<TResult> : CircuitBreakerStra
     /// <remarks>
     /// Value must be greater than 0.5 seconds. Defaults to 30 seconds.
     /// </remarks>
-    [TimeSpan("00:00:00.500")]
+    [Range(typeof(TimeSpan), "00:00:00.500", "1.00:00:00")]
     public TimeSpan SamplingDuration { get; set; } = CircuitBreakerConstants.DefaultSamplingDuration;
 }

src/Polly.Core/CircuitBreaker/CircuitBreakerStrategyOptions.cs

@@ -30,7 +30,7 @@ public abstract class CircuitBreakerStrategyOptions<TResult> : ResilienceStrateg
     /// Value must be greater than 0.5 seconds.
     /// Defaults to 5 seconds.
     /// </remarks>
-    [TimeSpan("00:00:00.500")]
+    [Range(typeof(TimeSpan), "00:00:00.500", "1.00:00:00")]
     public TimeSpan BreakDuration { get; set; } = CircuitBreakerConstants.DefaultBreakDuration;
 
     /// <summary>

src/Polly.Core/Retry/RetryStrategyOptions.TResult.cs

@@ -60,7 +60,7 @@ public class RetryStrategyOptions<TResult> : ResilienceStrategyOptions
     /// Defaults to 2 seconds.
     /// </para>
     /// </remarks>
-    [TimeSpan("00:00:00", "1.00:00:00")]
+    [Range(typeof(TimeSpan), "00:00:00", "1.00:00:00")]
     public TimeSpan BaseDelay { get; set; } = RetryConstants.DefaultBaseDelay;
 
     /// <summary>

src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs

@@ -32,7 +32,7 @@ protected internal override async ValueTask<Outcome<TResult>> ExecuteCoreAsync<T
         var timeout = DefaultTimeout;
         if (TimeoutGenerator is not null)
         {
-            timeout = await GenerateTimeoutAsync(context).ConfigureAwait(context.ContinueOnCapturedContext);
+            timeout = await TimeoutGenerator!(new TimeoutGeneratorArguments(context)).ConfigureAwait(context.ContinueOnCapturedContext);
         }
 
         if (!TimeoutUtil.ShouldApplyTimeout(timeout))
@@ -80,17 +80,6 @@ protected internal override async ValueTask<Outcome<TResult>> ExecuteCoreAsync<T
         return outcome;
     }
 
-    internal async ValueTask<TimeSpan> GenerateTimeoutAsync(ResilienceContext context)
-    {
-        var timeout = await TimeoutGenerator!(new TimeoutGeneratorArguments(context)).ConfigureAwait(context.ContinueOnCapturedContext);
-        if (!TimeoutUtil.IsTimeoutValid(timeout))
-        {
-            return DefaultTimeout;
-        }
-
-        return timeout;
-    }
-
     private static CancellationTokenRegistration CreateRegistration(CancellationTokenSource cancellationSource, CancellationToken previousToken)
     {
         if (previousToken.CanBeCanceled)

src/Polly.Core/Timeout/TimeoutResilienceStrategyBuilderExtensions.cs

@@ -13,7 +13,7 @@ public static class TimeoutResilienceStrategyBuilderExtensions
     /// </summary>
     /// <typeparam name="TBuilder">The builder type.</typeparam>
     /// <param name="builder">The builder instance.</param>
-    /// <param name="timeout">The timeout value. This value should be greater than <see cref="TimeSpan.Zero"/> or <see cref="System.Threading.Timeout.InfiniteTimeSpan"/>.</param>
+    /// <param name="timeout">The timeout value. This value should be greater than <see cref="TimeSpan.Zero"/>.</param>
     /// <returns>The same builder instance.</returns>
     /// <exception cref="ArgumentNullException">Thrown when <paramref name="builder"/> is <see langword="null"/>.</exception>
     /// <exception cref="ValidationException">Thrown when the options produced from the arguments are invalid.</exception>

src/Polly.Core/Timeout/TimeoutStrategyOptions.cs

@@ -1,3 +1,5 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace Polly.Timeout;
 
 /// <summary>
@@ -15,10 +17,10 @@ public class TimeoutStrategyOptions : ResilienceStrategyOptions
     /// Gets or sets the default timeout.
     /// </summary>
     /// <remarks>
-    /// By default, the value is set to <see cref="System.Threading.Timeout.InfiniteTimeSpan"/> thus making the timeout strategy disabled.
+    /// Defaults to 30 seconds. This value must be greater than 1 second and less than 24 hours.
     /// </remarks>
-    [Timeout]
-    public TimeSpan Timeout { get; set; } = System.Threading.Timeout.InfiniteTimeSpan;
+    [Range(typeof(TimeSpan), "00:00:01", "1.00:00:00")]
+    public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(30);
 
     /// <summary>
     /// Gets or sets the timeout generator that generates the timeout for a given execution.

src/Polly.Core/Timeout/TimeoutUtil.cs

@@ -8,14 +8,4 @@ public static bool ShouldApplyTimeout(TimeSpan timeout)
     {
         return timeout > TimeSpan.Zero;
     }
-
-    public static bool IsTimeoutValid(TimeSpan timeout)
-    {
-        if (timeout > TimeSpan.Zero)
-        {
-            return true;
-        }
-
-        return timeout == System.Threading.Timeout.InfiniteTimeSpan || timeout > TimeSpan.Zero;
-    }
 }

test/Polly.Core.Tests/CircuitBreaker/AdvancedCircuitBreakerOptionsTests.cs

@@ -91,8 +91,8 @@ public void InvalidOptions_Validate()
 
             Validation Errors:
             The field MinimumThroughput must be between 2 and 2147483647.
-            The field SamplingDuration must be >= to 00:00:00.5000000.
-            The field BreakDuration must be >= to 00:00:00.5000000.
+            The field SamplingDuration must be between 00:00:00.5000000 and 1.00:00:00.
+            The field BreakDuration must be between 00:00:00.5000000 and 1.00:00:00.
             The ShouldHandle field is required.
             """);
     }

test/Polly.Core.Tests/CircuitBreaker/SimpleCircuitBreakerOptionsTests.cs

@@ -83,7 +83,7 @@ public void InvalidOptions_Validate()
 
             Validation Errors:
             The field FailureThreshold must be between 1 and 2147483647.
-            The field BreakDuration must be >= to 00:00:00.5000000.
+            The field BreakDuration must be between 00:00:00.5000000 and 1.00:00:00.
             The ShouldHandle field is required.
             """);
     }

test/Polly.Core.Tests/Retry/RetryStrategyOptionsTests.cs

@@ -55,7 +55,7 @@ Invalid Options
 
             Validation Errors:
             The field RetryCount must be between -1 and 100.
-            The field BaseDelay must be >= to 00:00:00.
+            The field BaseDelay must be between 00:00:00 and 1.00:00:00.
             The ShouldHandle field is required.
             """);
     }

test/Polly.Core.Tests/Timeout/TimeoutResilienceStrategyBuilderExtensionsTests.cs

@@ -56,11 +56,11 @@ public void AddTimeout_InvalidOptions_Throws()
 
     private static TimeSpan GetTimeout(TimeoutResilienceStrategy strategy)
     {
-        if (strategy.TimeoutGenerator == null)
+        if (strategy.TimeoutGenerator is null)
         {
             return strategy.DefaultTimeout;
         }
 
-        return strategy.GenerateTimeoutAsync(ResilienceContext.Get()).Preserve().GetAwaiter().GetResult();
+        return strategy.TimeoutGenerator(new TimeoutGeneratorArguments(ResilienceContext.Get())).Preserve().GetAwaiter().GetResult();
     }
 }

test/Polly.Core.Tests/Timeout/TimeoutResilienceStrategyTests.cs

@@ -79,8 +79,8 @@ public async Task Execute_EnsureOnTimeoutCalled()
     public void Execute_NoTimeout(TimeSpan timeout)
     {
         var called = false;
-        var sut = CreateSut();
         SetTimeout(timeout);
+        var sut = CreateSut();
         sut.Execute(_ => { });
 
         called.Should().BeFalse();

test/Polly.Core.Tests/Timeout/TimeoutTestUtils.cs

@@ -12,12 +12,13 @@ public static class TimeoutTestUtils
     {
         TimeSpan.MinValue,
         TimeSpan.Zero,
-        TimeSpan.FromSeconds(-1)
+        TimeSpan.FromSeconds(-1),
+        TimeSpan.FromHours(25),
     };
 
     public static readonly TheoryData<TimeSpan> ValidTimeouts = new()
     {
-        System.Threading.Timeout.InfiniteTimeSpan,
-        TimeSpan.FromSeconds(1)
+        TimeSpan.FromSeconds(1),
+        TimeSpan.FromHours(1),
     };
 }