Merge development branch for v5.6.0

Author: reisenberger

.gitignore

@@ -13,6 +13,7 @@ TestResults
 *.user
 *.sln.docstates
 .vs/
+.vscode/
 
 # Build results
 [Dd]ebug/

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 5.6.0
+- Add ability to handle inner exceptions natively: .HandleInner<TEx>()
+- Allow WaitAndRetry policies to calculate wait based on the handled fault
+- Add the ability to access the policies within an IPolicyWrap
+- Allow PolicyWrap to configure policies expressed as interfaces
+- Bug fix: set context keys for generic execute methods with PolicyWrap
+- Bug fix: generic TResult method with non-generic fallback policy
+- Performance improvements
+- Multiple build speed improvements
+
 ## 5.5.0
 - Bug fix: non-generic CachePolicy with PolicyWrap
 - Add Cache interfaces

GitVersionConfig.yaml

@@ -1 +1 @@
-next-version: 5.5.0
+next-version: 5.6.0

README.md

@@ -27,7 +27,6 @@ You can install the Strongly Named version via:
     Install-Package Polly.Net40Async-Signed
 
 
-
 # Resilience policies
 
 Polly offers multiple resilience policies:
@@ -52,8 +51,6 @@ Fault-handling policies handle specific exceptions thrown by, or results returne
 
 ### (for fault-handling policies:  Retry family, CircuitBreaker family and Fallback)
 
-
-
 ```csharp
 // Single exception type
 Policy
@@ -72,6 +69,11 @@ Policy
 Policy
   .Handle<SqlException>(ex => ex.Number == 1205)
   .Or<ArgumentException>(ex => ex.ParamName == "example")
+
+// Inner exceptions of ordinary exceptions or AggregateException, with or without conditions
+Policy
+  .HandleInner<HttpResponseException>()
+  .OrInner<OperationCanceledException>(ex => ex.CancellationToken == myToken)
 ```
 
 ## Step 1b: (optionally) Specify return results you want to handle
@@ -938,6 +940,13 @@ For details of changes by release see the [change log](https://github.com/App-vN
 * [@jiimaho](https://github.com/jiimaho) and [@Extremo75](https://github.com/ExtRemo75) - Provide public factory methods for PolicyResult, to support testing.
 * [@Extremo75](https://github.com/ExtRemo75) - Allow fallback delegates to take handled fault as input parameter.
 * [@reisenberger](https://github.com/reisenberger) and [@seanfarrow](https://github.com/SeanFarrow) - Add CachePolicy, with interfaces for pluggable cache providers and serializers.
+* Thanks to the awesome devs at [@tretton37](https://github.com/tretton37) who delivered the following as part of a one-day in-company hackathon led by [@reisenberger](https://github.com/reisenberger), sponsored by [@tretton37](https://github.com/tretton37) and convened by [@thecodejunkie](https://github.com/thecodejunkie) 
+  * [@matst80](https://github.com/matst80) - Allow WaitAndRetry to take handled fault as an input to the sleepDurationProvider, allowing WaitAndRetry to take account of systems which specify a duration to wait as part of a fault response; eg Azure CosmosDB may specify this in `x-ms-retry-after-ms` headers or in a property to an exception thrown by the Azure CosmosDB SDK.
+  * [@MartinSStewart](https://github.com/martinsstewart) - Add GetPolicies() extension methods to IPolicyWrap.
+  * [@jbergens37](https://github.com/jbergens37) - Parallelize test running where possible, to improve overall build speed.
+* [@reisenberger](https://github.com/reisenberger) - Add new .HandleInner<TException>(...) syntax for handling inner exceptions natively.
+* [@rjongeneelen](https://github.com/rjongeneelen) and [@reisenberger](https://github.com/reisenberger) - Allow PolicyWrap configuration to configure policies via interfaces. 
+* [@reisenberger](https://github.com/reisenberger) - Performance improvements.
 
 # Sample Projects
 

src/Polly.Net40Async.Specs/Properties/AssemblyInfo.cs

@@ -2,4 +2,4 @@
 using Xunit;
 
 [assembly: AssemblyTitle("Polly.Net40Async.Specs")]
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
+[assembly: CollectionBehavior(DisableTestParallelization = false)]

src/Polly.Net40Async.nuspec

@@ -13,7 +13,17 @@
     <tags>Exception Handling Resilience Transient Fault Policy Circuit Breaker CircuitBreaker Retry Wait Cache Cache-aside Bulkhead Fallback Timeout Throttle Parallelization</tags>
     <copyright>Copyright © 2017, App vNext</copyright>
     <releaseNotes>
-     v5.0 is a major release with significant new resilience policies: Timeout; Bulkhead Isolation; Fallback; Cache; and PolicyWrap.  See release notes back to v5.0.0 for full details.  v5.0.5 includes important circuit-breaker fixes.
+     v5.0 is a major release with significant new resilience policies: Timeout; Bulkhead Isolation; Fallback; Cache; and PolicyWrap.  See release notes back to v5.0.0 for full details.
+
+     5.6.0
+     ---------------------
+     - Add ability to handle inner exceptions natively: .HandleInner&lt;TEx&gt;()
+     - Allow WaitAndRetry policies to calculate wait based on the handled fault
+     - Add the ability to access the policies within an IPolicyWrap
+     - Allow PolicyWrap to take interfaces as parameters
+     - Bug fix: set context keys for generic execute method with PolicyWrap
+     - Bug fix: generic TResult method with non-generic fallback policy
+     - Performance improvements
 
      5.5.0
      ---------------------

src/Polly.Net45.Specs/Properties/AssemblyInfo.cs

@@ -2,4 +2,4 @@
 using Xunit;
 
 [assembly: AssemblyTitle("Polly.Net45.Specs")]
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
+[assembly: CollectionBehavior(DisableTestParallelization = false)]

src/Polly.NetStandard11.Specs/Properties/AssemblyInfo.cs

@@ -1 +1 @@
-[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]
+[assembly: Xunit.CollectionBehavior(DisableTestParallelization = false)]

src/Polly.NetStandard11/Properties/AssemblyInfo.cs

@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Polly")]
-[assembly: AssemblyVersion("5.5.0.0")]
+[assembly: AssemblyVersion("5.6.0.0")]
 [assembly: CLSCompliant(true)]
 
 [assembly: InternalsVisibleTo("Polly.NetStandard11.Specs")]

src/Polly.Shared/CircuitBreaker/CircuitBreakerEngine.cs

@@ -1,8 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.ExceptionServices;
 using System.Threading;
 
+#if NET40
+using ExceptionDispatchInfo = Polly.Utilities.ExceptionDispatchInfo;
+#endif
+
 namespace Polly.CircuitBreaker
 {
     internal partial class CircuitBreakerEngine
@@ -36,13 +41,20 @@ internal static TResult Implementation<TResult>(
             }
             catch (Exception ex)
             {
-                if (!shouldHandleExceptionPredicates.Any(predicate => predicate(ex)))
+                Exception handledException = shouldHandleExceptionPredicates
+                    .Select(predicate => predicate(ex))
+                    .FirstOrDefault(e => e != null);
+                if (handledException == null)
                 {
                     throw;
                 }
 
-                breakerController.OnActionFailure(new DelegateResult<TResult>(ex), context);
+                breakerController.OnActionFailure(new DelegateResult<TResult>(handledException), context);
 
+                if (handledException != ex)
+                {
+                    ExceptionDispatchInfo.Capture(handledException).Throw();
+                }
                 throw;
             }
         }