Introduce Polly.Extensions project

.github/dependabot.yml

@@ -19,3 +19,6 @@ updates:
     - dependency-name: "System.ComponentModel.Annotations"
     - dependency-name: "System.Threading.Tasks.Extensions"
     - dependency-name: "System.ValueTuplens"
+    - dependency-name: "Microsoft.Extensions.Options"
+    - dependency-name: "Microsoft.Extensions.Logging.Abstractions"
+    - dependency-name: "System.Diagnostics.DiagnosticSource"

build.cake

@@ -216,6 +216,7 @@ Task("__RunMutationTests")
     .Does(() =>
 {
     TestProject(File("./src/Polly.Core/Polly.Core.csproj"), File("./src/Polly.Core.Tests/Polly.Core.Tests.csproj"), "Polly.Core.csproj");
+    TestProject(File("./src/Polly.Extensions/Polly.Extensions.csproj"), File("./src/Polly.Extensions.Tests/Polly.Extensions.Tests.csproj"), "Polly.Extensions.csproj");
     TestProject(File("./src/Polly/Polly.csproj"), File("./src/Polly.Specs/Polly.Specs.csproj"), "Polly.csproj");
 
     void TestProject(FilePath proj, FilePath testProj, string project)
@@ -264,6 +265,9 @@ Task("__CreateSignedNuGetPackages")
 
     Information("Building Polly.{0}.nupkg", nugetVersion);
     DotNetPack(System.IO.Path.Combine(srcDir, "Polly", "Polly.csproj"), dotNetPackSettings);
+
+    Information("Building Polly.Extensions.{0}.nupkg", nugetVersion);
+    DotNetPack(System.IO.Path.Combine(srcDir, "Polly.Extensions", "Polly.Extensions.csproj"), dotNetPackSettings);
 });
 
 //////////////////////////////////////////////////////////////////////

eng/Common.targets

@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(LegacySupport)' == 'true' AND !$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))">
-    <Compile Include="$(MSBuildThisFileDirectory)\..\src\LegacySupport\*.cs" LinkBase="LegacySupport" />
+    <Compile Include="$(MSBuildThisFileDirectory)..\src\LegacySupport\*.cs" LinkBase="LegacySupport" />
   </ItemGroup>
-
 </Project>

src/Directory.Packages.props

@@ -6,16 +6,30 @@
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.0.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="ReportGenerator" Version="5.1.19" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="8.51.0.59060" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
-</Project>
+  <ItemGroup Condition="$(TargetFramework) == 'net7.0'">
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework) == 'net6.0'">
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))">
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+  </ItemGroup>
+</Project>

src/Polly.Core.Tests/Builder/ResilienceStrategyBuilderOptionsTests.cs

@@ -1,3 +1,4 @@
+using Moq;
 using Polly.Builder;
 using Polly.Telemetry;
 using Polly.Utils;
@@ -16,4 +17,25 @@ public void Ctor_EnsureDefaults()
         options.TimeProvider.Should().Be(TimeProvider.System);
         options.TelemetryFactory.Should().Be(NullResilienceTelemetryFactory.Instance);
     }
+
+    [Fact]
+    public void Ctor_Copy_EnsureCopied()
+    {
+        var options = new ResilienceStrategyBuilderOptions
+        {
+            BuilderName = "test",
+            TelemetryFactory = Mock.Of<ResilienceTelemetryFactory>(),
+            TimeProvider = new FakeTimeProvider().Object
+        };
+
+        options.Properties.Set(new ResiliencePropertyKey<int>("A"), 1);
+        options.Properties.Set(new ResiliencePropertyKey<int>("B"), 2);
+
+        var other = new ResilienceStrategyBuilderOptions(options);
+
+        other.BuilderName.Should().Be("test");
+        other.TelemetryFactory.Should().BeSameAs(options.TelemetryFactory);
+        other.TimeProvider.Should().BeSameAs(options.TimeProvider);
+        other.Properties.Should().BeEquivalentTo(options.Properties);
+    }
 }

src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs

@@ -38,12 +38,28 @@ await TestUtils.AssertWithTimeoutAsync(async () =>
         }
     }
 
+    [Fact]
+    public async Task DelayAsync_SystemSynchronous_Ok()
+    {
+        var delay = TimeSpan.FromMilliseconds(5);
+        var context = ResilienceContext.Get();
+        context.Initialize<VoidResult>(isSynchronous: true);
+
+        await TestUtils.AssertWithTimeoutAsync(async () =>
+        {
+            var watch = Stopwatch.StartNew();
+            await TimeProvider.System.DelayAsync(delay, context);
+            var elapsed = watch.Elapsed;
+            elapsed.Should().BeGreaterThanOrEqualTo(delay);
+        });
+    }
+
     [InlineData(false, false)]
     [InlineData(false, true)]
     [InlineData(true, false)]
     [InlineData(true, true)]
     [Theory]
-    public async Task DelayAsync_CancellationRequestedbefore_Throws(bool synchronous, bool mocked)
+    public async Task DelayAsync_CancellationRequestedBefore_Throws(bool synchronous, bool mocked)
     {
         using var tcs = new CancellationTokenSource();
         tcs.Cancel();

src/Polly.Core/Builder/ResilienceStrategyBuilderOptions.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Polly.Telemetry;
 
@@ -8,6 +9,34 @@ namespace Polly.Builder;
 /// </summary>
 public class ResilienceStrategyBuilderOptions
 {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ResilienceStrategyBuilderOptions"/> class.
+    /// </summary>
+    public ResilienceStrategyBuilderOptions()
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ResilienceStrategyBuilderOptions"/> class.
+    /// </summary>
+    /// <param name="other">The options to copy the values from.</param>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public ResilienceStrategyBuilderOptions(ResilienceStrategyBuilderOptions other)
+    {
+        Guard.NotNull(other);
+
+        BuilderName = other.BuilderName;
+        TelemetryFactory = other.TelemetryFactory;
+        TimeProvider = other.TimeProvider;
+
+        IDictionary<string, object?> props = Properties;
+
+        foreach (KeyValuePair<string, object?> pair in other.Properties)
+        {
+            props.Add(pair.Key, pair.Value);
+        }
+    }
+
     /// <summary>
     /// Gets or sets the name of the builder.
     /// </summary>

src/Polly.Core/Polly.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.0;net472;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.0;net472;net462</TargetFrameworks>
     <AssemblyTitle>Polly.Core</AssemblyTitle>
     <RootNamespace>Polly</RootNamespace>
     <Nullable>enable</Nullable>
@@ -11,6 +11,7 @@
     <SkipPollyUsings>true</SkipPollyUsings>
     <MutationScore>100</MutationScore>
     <LegacySupport>true</LegacySupport>
+    <InjectSharedSources>true</InjectSharedSources>
   </PropertyGroup>
 
   <ItemGroup>

src/Polly.Extensions.Tests/DependencyInjection/PollyDependencyInjectionKeysTests.cs

@@ -0,0 +1,12 @@
+using Polly.Extensions.DependencyInjection;
+
+namespace Polly.Extensions.Tests.DependencyInjection;
+
+public class PollyDependencyInjectionKeysTests
+{
+    [Fact]
+    public void ServiceProvider_Ok()
+    {
+        PollyDependencyInjectionKeys.ServiceProvider.Key.Should().Be("Polly.DependencyInjection.ServiceProvider");
+    }
+}