giraffe-fsharp · dustinmoris · Dec 8, 2020 · May 27, 2020 · Jun 19, 2020 · Jun 22, 2020
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
@@ -153,10 +153,10 @@ let webApp =
 
 Another important aspect of Giraffe is that it natively works with .NET's `Task` and `Task<'T>` objects instead of relying on F#'s `async {}` workflows. The main benefit of this is that it removes the necessity of converting back and forth between tasks and async workflows when building a Giraffe web application (because ASP.NET Core only works with tasks out of the box).
 
-For this purpose Giraffe uses the `task {}` computation expression from the [TaskBuilder.fs](https://www.nuget.org/packages/TaskBuilder.fs/) NuGet package. Syntactically it works identical to F#'s async workflows (after opening the `FSharp.Control.Tasks.V2.ContextInsensitive` module):
+For this purpose Giraffe uses the `task {}` computation expression from the [Ply](https://www.nuget.org/packages/Ply/) NuGet package. Syntactically it works identical to F#'s async workflows (after opening the `FSharp.Control.Tasks.Builders` module):
 
 ```fsharp
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Giraffe
 
 let personHandler =
@@ -167,14 +167,14 @@ let personHandler =
         }
 ```
 
-The `task {}` CE is an independent project maintained by [Robert Peele](https://github.com/rspeele), for more information please visit the official [TaskBuilder.fs](https://github.com/rspeele/TaskBuilder.fs) GitHub repository.
+The `task {}` CE is an independent project maintained by [Crowded](https://github.com/crowded), for more information please visit the official [Ply](https://github.com/crowded/ply) GitHub repository.
 
 **IMPORTANT NOTICE**
 
 If you have `do!` bindings in your Giraffe web application then you must open the `FSharp.Control.Tasks.V2.ContextInsensitive` namespace to resolve any type inference issues:
 
 ```fsharp
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 ```
 
 ### Ways of creating a new HttpHandler
@@ -212,7 +212,7 @@ Because an `HttpHandler` is defined as `HttpFunc -> HttpContext -> HttpFuncResul
 The most verbose version of defining a new `HttpHandler` function is by explicitly returning a `Task<HttpContext option>`. This is useful when an async operation needs to be called from within an `HttpHandler` function:
 
 ```fsharp
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 
 type Person = { Name : string }
 

diff --git a/src/Giraffe/Auth.fs b/src/Giraffe/Auth.fs
@@ -7,7 +7,7 @@ module Auth =
     open Microsoft.AspNetCore.Http
     open Microsoft.AspNetCore.Authentication
     open Microsoft.AspNetCore.Authorization
-    open FSharp.Control.Tasks.V2.ContextInsensitive
+    open FSharp.Control.Tasks.Builders
 
     /// <summary>
     /// Challenges a client to authenticate via a specific authScheme.

diff --git a/src/Giraffe/Core.fs b/src/Giraffe/Core.fs
@@ -7,7 +7,7 @@ module Core =
     open System.Globalization
     open Microsoft.AspNetCore.Http
     open Microsoft.Extensions.Logging
-    open FSharp.Control.Tasks.V2.ContextInsensitive
+    open FSharp.Control.Tasks.Builders
     open Giraffe.ViewEngine
 
     /// <summary>

diff --git a/src/Giraffe/EndpointRouting.fs b/src/Giraffe/EndpointRouting.fs
@@ -9,7 +9,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Routing
 open Microsoft.FSharp.Reflection
 open FSharp.Core
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Giraffe
 
 module private RouteTemplateBuilder =

diff --git a/src/Giraffe/Giraffe.fsproj b/src/Giraffe/Giraffe.fsproj
@@ -48,10 +48,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.3.*" />
+    <PackageReference Include="System.Text.Json" Version="5.0.*" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.*" />
     <PackageReference Include="Utf8Json" Version="1.3.*" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
-    <PackageReference Include="System.Text.Json" Version="5.0.*" />
+    <PackageReference Include="Ply" Version="0.1.*" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.*" PrivateAssets="All" />
     <PackageReference Include="Giraffe.ViewEngine" Version="1.3.*" />
   </ItemGroup>

diff --git a/src/Giraffe/Helpers.fs b/src/Giraffe/Helpers.fs
@@ -4,7 +4,7 @@ namespace Giraffe
 module Helpers =
     open System
     open System.IO
-    open FSharp.Control.Tasks.V2.ContextInsensitive
+    open FSharp.Control.Tasks.Builders
 
     /// <summary>
     /// Checks if an object is not null.

diff --git a/src/Giraffe/HttpContextExtensions.fs b/src/Giraffe/HttpContextExtensions.fs
@@ -11,7 +11,7 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.Extensions.Primitives
 open Microsoft.Extensions.Logging
 open Microsoft.Net.Http.Headers
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Giraffe.ViewEngine
 
 type MissingDependencyException(dependencyName : string) =

diff --git a/src/Giraffe/Json.fs b/src/Giraffe/Json.fs
@@ -25,7 +25,7 @@ module NewtonsoftJson =
     open System.Text
     open System.Threading.Tasks
     open Microsoft.IO
-    open FSharp.Control.Tasks.V2.ContextInsensitive
+    open FSharp.Control.Tasks.Builders
     open Newtonsoft.Json
     open Newtonsoft.Json.Serialization
 

diff --git a/src/Giraffe/Middleware.fs b/src/Giraffe/Middleware.fs
@@ -9,7 +9,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.DependencyInjection.Extensions
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 
 // ---------------------------
 // Default middleware

diff --git a/src/Giraffe/Preconditional.fs b/src/Giraffe/Preconditional.fs
@@ -8,7 +8,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Http.Headers
 open Microsoft.Extensions.Primitives
 open Microsoft.Net.Http.Headers
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 
 type Precondition =
     | NoConditionsSpecified

diff --git a/src/Giraffe/Routing.fs b/src/Giraffe/Routing.fs
@@ -3,7 +3,7 @@ namespace Giraffe
 [<RequireQualifiedAccess>]
 module SubRouting =
     open Microsoft.AspNetCore.Http
-    open FSharp.Control.Tasks.V2.ContextInsensitive
+    open FSharp.Control.Tasks.Builders
 
     [<Literal>]
     let private RouteKey = "giraffe_route"

diff --git a/src/Giraffe/Streaming.fs b/src/Giraffe/Streaming.fs
@@ -10,7 +10,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Http.Extensions
 open Microsoft.Extensions.Primitives
 open Microsoft.Net.Http.Headers
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 
 // ---------------------------
 // HTTP Range parsing

diff --git a/tests/Giraffe.Tests/AuthTests.fs b/tests/Giraffe.Tests/AuthTests.fs
@@ -3,7 +3,7 @@ module Giraffe.Tests.AuthTests
 open System.IO
 open System.Security.Claims
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open NSubstitute
 open Xunit
 open Giraffe

diff --git a/tests/Giraffe.Tests/Helpers.fs b/tests/Giraffe.Tests/Helpers.fs
@@ -14,7 +14,7 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.AspNetCore.TestHost
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open NSubstitute
 open Utf8Json

diff --git a/tests/Giraffe.Tests/HttpContextExtensionsTests.fs b/tests/Giraffe.Tests/HttpContextExtensionsTests.fs
@@ -5,7 +5,7 @@ open System.IO
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open NSubstitute
 open Giraffe

diff --git a/tests/Giraffe.Tests/HttpHandlerTests.fs b/tests/Giraffe.Tests/HttpHandlerTests.fs
@@ -5,7 +5,7 @@ open System.IO
 open System.Collections.Generic
 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open NSubstitute
 open Giraffe

diff --git a/tests/Giraffe.Tests/ModelBindingTests.fs b/tests/Giraffe.Tests/ModelBindingTests.fs
@@ -8,7 +8,7 @@ open System.Text
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open NSubstitute
 open Giraffe

diff --git a/tests/Giraffe.Tests/ModelValidationTests.fs b/tests/Giraffe.Tests/ModelValidationTests.fs
@@ -6,7 +6,7 @@ open System.Net.Http
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.Logging
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open Giraffe
 

diff --git a/tests/Giraffe.Tests/PreconditionalTests.fs b/tests/Giraffe.Tests/PreconditionalTests.fs
@@ -7,7 +7,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.Logging
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open Giraffe
 

diff --git a/tests/Giraffe.Tests/RoutingTests.fs b/tests/Giraffe.Tests/RoutingTests.fs
@@ -4,7 +4,7 @@ open System
 open System.IO
 open System.Collections.Generic
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open NSubstitute
 open Giraffe

diff --git a/tests/Giraffe.Tests/StreamingTests.fs b/tests/Giraffe.Tests/StreamingTests.fs
@@ -6,7 +6,7 @@ open System.Net.Http
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.Logging
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open FSharp.Control.Tasks.Builders
 open Xunit
 open Giraffe