Merge branch 'main' into benchmarks-on-net7

App-vNext · Jan 9, 2023 · b6768be · b6768be
2 parents c1d3cbc + 6f997c4
commit b6768be
Show file tree

Hide file tree

Showing 271 changed files with 305 additions and 1,624 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,5 +4,44 @@
     <AssemblyOriginatorKeyFile>..\Polly.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
+  <ItemGroup>
+    <Using Include="System.Collections" />
+    <Using Include="System.Collections.Concurrent" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Reflection" />
+    <Using Include="Polly.Bulkhead" />
+    <Using Include="Polly.Caching" />
+    <Using Include="Polly.CircuitBreaker" />
+    <Using Include="Polly.Fallback" />
+    <Using Include="Polly.NoOp" />
+    <Using Include="Polly.RateLimit" />
+    <Using Include="Polly.Registry" />
+    <Using Include="Polly.Retry" />
+    <Using Include="Polly.Timeout" />
+    <Using Include="Polly.Utilities" />
+    <Using Include="Polly.Wrap" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(ProjectName)' == 'Polly.Specs'">
+    <Using Include="FluentAssertions" />
+    <Using Include="FluentAssertions.Execution" />
+    <Using Include="FluentAssertions.Extensions" />
+    <Using Include="Moq" />
+    <Using Include="Polly.Specs.Helpers" />
+    <Using Include="Polly.Specs.Helpers.Bulkhead" />
+    <Using Include="Polly.Specs.Helpers.Caching" />
+    <Using Include="Polly.Specs.Helpers.Custom.AddBehaviourIfHandle" />
+    <Using Include="Polly.Specs.Helpers.Custom.PreExecute" />
+    <Using Include="Polly.Specs.Helpers.RateLimit" />
+    <Using Include="Xunit" />
+    <Using Include="Xunit.Abstractions" />
+    <Using Include="Xunit.Sdk" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(ProjectName)' == 'Polly.Benchmarks'">
+    <Using Include="BenchmarkDotNet.Attributes" />
+    <Using Include="BenchmarkDotNet.Configs" />
+    <Using Include="BenchmarkDotNet.Jobs" />
+    <Using Include="BenchmarkDotNet.Running" />
+  </ItemGroup>
 </Project>
diff --git a/src/Polly.Benchmarks/Bulkhead.cs b/src/Polly.Benchmarks/Bulkhead.cs
@@ -1,8 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class Bulkhead

diff --git a/src/Polly.Benchmarks/Cache.cs b/src/Polly.Benchmarks/Cache.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-using Microsoft.Extensions.Caching.Memory;
-using Polly.Caching;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace Polly.Benchmarks;
 

diff --git a/src/Polly.Benchmarks/CircuitBreaker.cs b/src/Polly.Benchmarks/CircuitBreaker.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class CircuitBreaker

diff --git a/src/Polly.Benchmarks/Fallback.cs b/src/Polly.Benchmarks/Fallback.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class Fallback

diff --git a/src/Polly.Benchmarks/NoOp.cs b/src/Polly.Benchmarks/NoOp.cs
@@ -1,8 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class NoOp

diff --git a/src/Polly.Benchmarks/PolicyWrap.cs b/src/Polly.Benchmarks/PolicyWrap.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class PolicyWrap

diff --git a/src/Polly.Benchmarks/PollyConfig.cs b/src/Polly.Benchmarks/PollyConfig.cs
@@ -1,7 +1,4 @@
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Jobs;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 internal class PollyConfig : ManualConfig
 {

diff --git a/src/Polly.Benchmarks/Program.cs b/src/Polly.Benchmarks/Program.cs
@@ -1,4 +1 @@
-using System.Reflection;
-using BenchmarkDotNet.Running;
-
-BenchmarkRunner.Run(Assembly.GetCallingAssembly(), args: args); 
+BenchmarkRunner.Run(Assembly.GetCallingAssembly(), args: args); 
diff --git a/src/Polly.Benchmarks/RateLimit.cs b/src/Polly.Benchmarks/RateLimit.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class RateLimit

diff --git a/src/Polly.Benchmarks/Retry.cs b/src/Polly.Benchmarks/Retry.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class Retry

diff --git a/src/Polly.Benchmarks/Timeout.cs b/src/Polly.Benchmarks/Timeout.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 [Config(typeof(PollyConfig))]
 public class Timeout

diff --git a/src/Polly.Benchmarks/Workloads.cs b/src/Polly.Benchmarks/Workloads.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Polly.Benchmarks;
+namespace Polly.Benchmarks;
 
 internal static class Workloads
 {

diff --git a/src/Polly.Specs/Bulkhead/BulkheadAsyncSpecs.cs b/src/Polly.Specs/Bulkhead/BulkheadAsyncSpecs.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Polly.Bulkhead;
-using Polly.Specs.Helpers.Bulkhead;
-using FluentAssertions;
-using Polly.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 [Collection(Helpers.Constants.ParallelThreadDependentTestCollection)]
 public class BulkheadAsyncSpecs : BulkheadSpecsBase

diff --git a/src/Polly.Specs/Bulkhead/BulkheadScenarios.cs b/src/Polly.Specs/Bulkhead/BulkheadScenarios.cs
@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 /// <summary>
 /// A set of test scenarios used in all BulkheadPolicy tests.

diff --git a/src/Polly.Specs/Bulkhead/BulkheadSpecs.cs b/src/Polly.Specs/Bulkhead/BulkheadSpecs.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Polly.Bulkhead;
-using Polly.Specs.Helpers.Bulkhead;
-using FluentAssertions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 [Collection(Helpers.Constants.ParallelThreadDependentTestCollection)]
 public class BulkheadSpecs : BulkheadSpecsBase

diff --git a/src/Polly.Specs/Bulkhead/BulkheadSpecsBase.cs b/src/Polly.Specs/Bulkhead/BulkheadSpecsBase.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using FluentAssertions;
-using Polly.Bulkhead;
-using Polly.Specs.Helpers.Bulkhead;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 [Collection(Helpers.Constants.ParallelThreadDependentTestCollection)]
 public abstract class BulkheadSpecsBase : IDisposable

diff --git a/src/Polly.Specs/Bulkhead/BulkheadTResultAsyncSpecs.cs b/src/Polly.Specs/Bulkhead/BulkheadTResultAsyncSpecs.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Polly.Bulkhead;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Bulkhead;
-using FluentAssertions;
-using Polly.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 [Collection(Constants.ParallelThreadDependentTestCollection)]
 public class BulkheadTResultAsyncSpecs : BulkheadSpecsBase

diff --git a/src/Polly.Specs/Bulkhead/BulkheadTResultSpecs.cs b/src/Polly.Specs/Bulkhead/BulkheadTResultSpecs.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Polly.Bulkhead;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Bulkhead;
-
-using FluentAssertions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 [Collection(Constants.ParallelThreadDependentTestCollection)]
 public class BulkheadTResultSpecs : BulkheadSpecsBase

diff --git a/src/Polly.Specs/Bulkhead/IBulkheadPolicySpecs.cs b/src/Polly.Specs/Bulkhead/IBulkheadPolicySpecs.cs
@@ -1,8 +1,4 @@
-using FluentAssertions;
-using Polly.Bulkhead;
-using Xunit;
-
-namespace Polly.Specs.Bulkhead;
+namespace Polly.Specs.Bulkhead;
 
 public class IBulkheadPolicySpecs
 {

diff --git a/src/Polly.Specs/Caching/AbsoluteTtlSpecs.cs b/src/Polly.Specs/Caching/AbsoluteTtlSpecs.cs
@@ -1,11 +1,4 @@
-using System;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Utilities;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class AbsoluteTtlSpecs : IDisposable

diff --git a/src/Polly.Specs/Caching/CacheAsyncSpecs.cs b/src/Polly.Specs/Caching/CacheAsyncSpecs.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Caching;
-using Polly.Utilities;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheAsyncSpecs : IDisposable

diff --git a/src/Polly.Specs/Caching/CacheSpecs.cs b/src/Polly.Specs/Caching/CacheSpecs.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Threading;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Caching;
-using Polly.Utilities;
-using Polly.Wrap;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheSpecs : IDisposable

diff --git a/src/Polly.Specs/Caching/CacheTResultAsyncSpecs.cs b/src/Polly.Specs/Caching/CacheTResultAsyncSpecs.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Caching;
-using Polly.Utilities;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheTResultAsyncSpecs : IDisposable

diff --git a/src/Polly.Specs/Caching/CacheTResultSpecs.cs b/src/Polly.Specs/Caching/CacheTResultSpecs.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Threading;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Caching;
-using Polly.Utilities;
-using Polly.Wrap;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheTResultSpecs : IDisposable

diff --git a/src/Polly.Specs/Caching/ContextualTtlSpecs.cs b/src/Polly.Specs/Caching/ContextualTtlSpecs.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using FluentAssertions;
-using Polly.Caching;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 public class ContextualTtlSpecs
 {

diff --git a/src/Polly.Specs/Caching/DefaultCacheKeyStrategySpecs.cs b/src/Polly.Specs/Caching/DefaultCacheKeyStrategySpecs.cs
@@ -1,8 +1,4 @@
-using FluentAssertions;
-using Polly.Caching;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 public class DefaultCacheKeyStrategySpecs
 {

diff --git a/src/Polly.Specs/Caching/GenericCacheProviderAsyncSpecs.cs b/src/Polly.Specs/Caching/GenericCacheProviderAsyncSpecs.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Caching;
-using Polly.Utilities;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class GenericCacheProviderAsyncSpecs : IDisposable

diff --git a/src/Polly.Specs/Caching/GenericCacheProviderSpecs.cs b/src/Polly.Specs/Caching/GenericCacheProviderSpecs.cs
@@ -1,12 +1,4 @@
-using System;
-using FluentAssertions;
-using Polly.Caching;
-using Polly.Specs.Helpers;
-using Polly.Specs.Helpers.Caching;
-using Polly.Utilities;
-using Xunit;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class GenericCacheProviderSpecs : IDisposable