Some cleanup

src/Flo/Builder.cs

@@ -30,9 +30,9 @@ public TBuilder Fork(
             Func<TIn, bool> predicate,
             Action<TBuilder> configurePipeline)
         {
-            return When(predicate, async (input, innerPipeline, next) =>
+            return When(predicate, (input, innerPipeline, next) =>
             {
-                return await innerPipeline.Invoke(input);
+                return innerPipeline.Invoke(input);
             },
             configurePipeline);
         }
@@ -70,15 +70,15 @@ public TBuilder When(
 
             return Add(async (input, next) =>
             {
-                var doInvoke = await predicate.Invoke(input);
+                var doInvoke = await predicate.Invoke(input).ConfigureAwait(false);
                 if (doInvoke)
                 {
                     var builder = CreateBuilder();
                     configurePipeline(builder);
-                    return await handler.Invoke(input, builder.Build(), next);
+                    return await handler.Invoke(input, builder.Build(), next).ConfigureAwait(false);
                 }
 
-                return await next.Invoke(input);
+                return await next.Invoke(input).ConfigureAwait(false);
             });
         }
 
@@ -140,5 +140,7 @@ public virtual Func<TIn, Task<TOut>> Build()
         }
 
         private static object DefaultServiceProvider(Type type) => Activator.CreateInstance(type);
+
+        protected static Task<TOut> CompletedEmptyOutTask = Task.FromResult(default(TOut));
     }
 }

src/Flo/Flo.csproj

@@ -8,7 +8,7 @@
     <AssemblyName>Flo</AssemblyName>
     <PackageId>Flo</PackageId>
     <PackageProjectUrl>https://github.com/benfoster/flo</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/benfoster/Flo/raw/master/LICENSE.MD</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/benfoster/flo</RepositoryUrl>
     <TargetFramework>netstandard1.3</TargetFramework>

src/Flo/OutputPipelineBuilder.cs

@@ -9,7 +9,7 @@ public class OutputPipelineBuilder<TIn, TOut>
         private static Func<TOut, bool> DefaultContinuation = output => output == null;
 
         public OutputPipelineBuilder(Func<Type, object> serviceProvider = null) 
-            : base(input => Task.FromResult(default(TOut)), serviceProvider)
+            : base(input => CompletedEmptyOutTask, serviceProvider)
         {
         }
 
@@ -20,11 +20,11 @@ public OutputPipelineBuilder<TIn, TOut> When(
         {
             return When(predicate, async (input, innerPipeline, next) =>
             {
-                var result = await innerPipeline.Invoke(input);
+                var result = await innerPipeline.Invoke(input).ConfigureAwait(false);
 
                 // Continue on to the parent pipeline if the continueIf output predicate matches
                 if ((continueIf ?? DefaultContinuation).Invoke(result))                
-                    return await next.Invoke(input);
+                    return await next.Invoke(input).ConfigureAwait(false);
 
                 return result;
             },
@@ -38,11 +38,11 @@ public OutputPipelineBuilder<TIn, TOut> When(
         {
             return When(predicate, async (input, innerPipeline, next) =>
             {
-                var result = await innerPipeline.Invoke(input);
+                var result = await innerPipeline.Invoke(input).ConfigureAwait(false);
 
                 // Continue on to the parent pipeline if the continueIf output predicate matches
                 if ((continueIf ?? DefaultContinuation).Invoke(result))
-                    return await next.Invoke(input);
+                    return await next.Invoke(input).ConfigureAwait(false);
 
                 return result;
             },

src/Flo/PipelineBuilder.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Flo
@@ -9,7 +8,6 @@ public class PipelineBuilder<T> : Builder<T, T, PipelineBuilder<T>> // : Builder
         public PipelineBuilder(Func<Type, object> serviceProvider = null)
             : base(input => Task.FromResult(input), serviceProvider)
         {
-            InnerHandler = input => Task.FromResult(input);
         }
 
         public PipelineBuilder<T> When(
@@ -18,8 +16,8 @@ public PipelineBuilder<T> When(
         {
             return When(predicate, async (input, innerPipeline, next) =>
             {
-                input = await innerPipeline.Invoke(input);
-                return await next.Invoke(input);
+                input = await innerPipeline.Invoke(input).ConfigureAwait(false);
+                return await next.Invoke(input).ConfigureAwait(false);
             },
             configurePipeline);
         }
@@ -30,8 +28,8 @@ public PipelineBuilder<T> When(
         {
             return When(predicate, async (input, innerPipeline, next) =>
             {
-                input = await innerPipeline.Invoke(input);
-                return await next.Invoke(input);
+                input = await innerPipeline.Invoke(input).ConfigureAwait(false);
+                return await next.Invoke(input).ConfigureAwait(false);
             },
             configurePipeline);
         }

test/Flo.Tests/OutputPipelineBuilderForkTests.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using NSpec;
 using Shouldly;