src/RethinkDb.Driver.FSharp/Config.fs

@@ -6,6 +6,7 @@ open Microsoft.Extensions.Logging
 open Newtonsoft.Json.Linq
 open RethinkDb.Driver
 open RethinkDb.Driver.Net
+open System.Threading.Tasks
 
 /// Parameters for the RethinkDB configuration
 type DataConfigParameter =
@@ -42,38 +43,26 @@ type DataConfig =
         this.Parameters
         |> Seq.fold ConnectionBuilder.build (RethinkDB.R.Connection ())
         
-    /// Create a RethinkDB connection (task async)
-    member this.CreateConnection() = backgroundTask {
-        let! conn = this.BuildConnection().ConnectAsync()
-        return conn :> IConnection
-    }
+    /// Create a RethinkDB connection
+    member this.CreateConnection () : IConnection =
+        (this.BuildConnection ()).Connect ()
 
-    /// Create a RethinkDB connection, logging the connection settings (task async)
-    member this.CreateConnection(log: ILogger) = backgroundTask {
-        let builder = this.BuildConnection()
-        if not (isNull log) then log.LogInformation $"Connecting to {this.EffectiveUri}"
-        let! conn = builder.ConnectAsync()
-        return conn :> IConnection
-    }
-    
-    /// Create a RethinkDB connection (F# async)
-    member this.CreateAsyncConnection() =
-        this.CreateConnection() |> Async.AwaitTask
-    
-    /// Create a RethinkDB connection, logging the connection settings (F# async)
-    member this.CreateAsyncConnection(log: ILogger) =
-        this.CreateConnection(log) |> Async.AwaitTask
-    
-    /// Create a RethinkDB connection (sync)
-    member this.CreateSyncConnection() : IConnection =
-        this.BuildConnection().Connect()
-
-    /// Create a RethinkDB connection, logging the connection settings (sync)
-    member this.CreateSyncConnection(log: ILogger) : IConnection =
+    /// Create a RethinkDB connection, logging the connection settings
+    member this.CreateConnection (log : ILogger) : IConnection =
         let builder = this.BuildConnection ()
         if not (isNull log) then log.LogInformation $"Connecting to {this.EffectiveUri}"
         builder.Connect ()
     
+    /// Create a RethinkDB connection
+    member this.CreateConnectionAsync () : Task<Connection> =
+        (this.BuildConnection ()).ConnectAsync ()
+    
+    /// Create a RethinkDB connection, logging the connection settings
+    member this.CreateConnectionAsync (log : ILogger) : Task<Connection> =
+        let builder = this.BuildConnection ()
+        if not (isNull log) then log.LogInformation $"Connecting to {this.EffectiveUri}"
+        builder.ConnectAsync ()
+    
     /// The effective hostname
     member this.Hostname =
         match this.Parameters |> List.tryPick (fun x -> match x with Hostname _ -> Some x | _ -> None) with

src/RethinkDb.Driver.FSharp/Functions.fs

@@ -18,17 +18,15 @@ module private Helpers =
 // ~~ WRITES ~~
     
 /// Write a ReQL command with a cancellation token, always returning a result
-let runWriteResultWithCancel cancelToken (expr: ReqlExpr) = fun conn -> backgroundTask {
-    return! expr.RunWriteAsync(conn, cancelToken)
-}
+let runWriteResultWithCancel cancelToken (expr : ReqlExpr) = fun conn ->
+    expr.RunWriteAsync (conn, cancelToken)
 
 /// Write a ReQL command, always returning a result
 let runWriteResult expr = runWriteResultWithCancel CancellationToken.None expr
 
 /// Write a ReQL command with optional arguments and a cancellation token, always returning a result
-let runWriteResultWithOptArgsAndCancel args cancelToken (expr: ReqlExpr) = fun conn -> backgroundTask {
-    return! expr.RunWriteAsync(conn, RunOptArg.create args, cancelToken)
-}
+let runWriteResultWithOptArgsAndCancel args cancelToken (expr : ReqlExpr) = fun conn ->
+    expr.RunWriteAsync (conn, RunOptArg.create args, cancelToken)
 
 /// Write a ReQL command with optional arguments, always returning a result
 let runWriteResultWithOptArgs args expr = runWriteResultWithOptArgsAndCancel args CancellationToken.None expr
@@ -110,14 +108,12 @@ let syncWriteWithOptArgs args expr = fun conn ->
 //    ~~ Full results (atom / sequence) ~~
 
 /// Run the ReQL command using a cancellation token, returning the result as the type specified
-let runResultWithCancel<'T> cancelToken (expr: ReqlExpr) = fun conn -> backgroundTask {
-    return! expr.RunResultAsync<'T>(conn, cancelToken)
-}
+let runResultWithCancel<'T> cancelToken (expr : ReqlExpr) = fun conn ->
+    expr.RunResultAsync<'T> (conn, cancelToken)
 
 /// Run the ReQL command using optional arguments and a cancellation token, returning the result as the type specified
-let runResultWithOptArgsAndCancel<'T> args cancelToken (expr: ReqlExpr) = fun conn -> backgroundTask {
-    return! expr.RunResultAsync<'T>(conn, RunOptArg.create args, cancelToken)
-}
+let runResultWithOptArgsAndCancel<'T> args cancelToken (expr : ReqlExpr) = fun conn ->
+    expr.RunResultAsync<'T> (conn, RunOptArg.create args, cancelToken)
 
 /// Run the ReQL command, returning the result as the type specified
 let runResult<'T> expr = runResultWithCancel<'T> CancellationToken.None expr
@@ -169,22 +165,20 @@ let asAsyncOption (f: IConnection -> Async<'T>) conn = async {
 let asSyncOption (f : IConnection -> 'T) conn = nullToOption (f conn)
 
 /// Ignore the result of a task-based query
-let ignoreResult<'T> (f: IConnection -> Tasks.Task<'T>) conn = backgroundTask {
-    let! _ = f conn
+let ignoreResult<'T> (f : IConnection -> Tasks.Task<'T>) conn = task {
+    let! _ = (f conn).ConfigureAwait false
     ()
 }
 
 //    ~~ Cursors / partial results (sequence / partial) ~~
 
 /// Run the ReQL command using a cancellation token, returning a cursor for the type specified
-let runCursorWithCancel<'T> cancelToken (expr: ReqlExpr) = fun conn -> backgroundTask {
-    return! expr.RunCursorAsync<'T>(conn, cancelToken)
-}
+let runCursorWithCancel<'T> cancelToken (expr : ReqlExpr) = fun conn ->
+    expr.RunCursorAsync<'T> (conn, cancelToken)
 
 /// Run the ReQL command using optional arguments and a cancellation token, returning a cursor for the type specified
-let runCursorWithOptArgsAndCancel<'T> args cancelToken (expr: ReqlExpr) = fun conn -> backgroundTask {
-    return! expr.RunCursorAsync<'T>(conn, RunOptArg.create args, cancelToken)
-}
+let runCursorWithOptArgsAndCancel<'T> args cancelToken (expr : ReqlExpr) = fun conn ->
+    expr.RunCursorAsync<'T> (conn, RunOptArg.create args, cancelToken)
 
 /// Run the ReQL command, returning a cursor for the type specified
 let runCursor<'T> expr = runCursorWithCancel<'T> CancellationToken.None expr
@@ -235,13 +229,13 @@ let toList<'T> (f: IConnection -> Task<Cursor<'T>>) = fun conn -> backgroundTask
 }
 
 /// Convert a cursor to a list of items
-let asyncToList<'T> (f: IConnection -> Async<Cursor<'T>>) = fun conn -> async {
+let toListAsync<'T> (f : IConnection -> Async<Cursor<'T>>) = fun conn -> async {
     use! cursor = f conn
     return! cursorToList<'T> cursor |> Async.AwaitTask
 }
 
 /// Convert a cursor to a list of items
-let syncToList<'T> (f: IConnection -> Cursor<'T>) = fun conn ->
+let toListSync<'T> (f : IConnection -> Cursor<'T>) = fun conn ->
     use cursor = f conn
     cursorToList cursor |> Async.AwaitTask |> Async.RunSynchronously
 
@@ -646,9 +640,7 @@ let withRetry<'T> intervals f =
 
 /// Convert an async function to a task function (Polly does not understand F# Async)
 let private asyncFuncToTask<'T> (f : IConnection -> Async<'T>) =
-    fun conn -> backgroundTask {
-        return! f conn |> Async.StartAsTask
-    }
+    fun conn -> f conn |> Async.StartAsTask
 
 /// Retry, delaying for each the seconds provided (if required)
 let withAsyncRetry<'T> intervals f = fun conn ->

src/RethinkDb.Driver.FSharp/Functions.fsi

@@ -159,10 +159,10 @@ val syncCursorWithOptArgs<'T> : RunOptArg list -> ReqlExpr -> (IConnection -> Cu
 val toList<'T> : (IConnection -> Task<Cursor<'T>>) -> IConnection -> Task<'T list>
 
 /// Convert a cursor to a list of items
-val asyncToList<'T> : (IConnection -> Async<Cursor<'T>>) -> IConnection -> Async<'T list>
+val toListAsync<'T> : (IConnection -> Async<Cursor<'T>>) -> IConnection -> Async<'T list>
 
 /// Convert a cursor to a list of items
-val syncToList<'T> : (IConnection -> Cursor<'T>) -> IConnection -> 'T list
+val toListSync<'T> : (IConnection -> Cursor<'T>) -> IConnection -> 'T list
 
 /// Apply a connection to the query pipeline (typically the final step)
 val withConn<'T> : IConnection -> (IConnection -> 'T) -> 'T

src/RethinkDb.Driver.FSharp/OptArgs.fs

@@ -374,3 +374,4 @@ module UpdateOptArg =
             | NonAtomic       non -> upd.OptArg ("non_atomic", non)
             | IgnoreWriteHook ign -> upd.OptArg ("ignore_write_hook", ign))
             u
+

src/RethinkDb.Driver.FSharp/RethinkDb.Driver.FSharp.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <Description>Idiomatic F# extensions on the official RethinkDB C# driver</Description>
     <Authors>Daniel J. Summers,Bit Badger Solutions</Authors>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -13,7 +13,8 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Copyright>See LICENSE</Copyright>
     <PackageTags>RethinkDB document F#</PackageTags>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>0.9.0</VersionPrefix>
+    <VersionSuffix>beta-07</VersionSuffix>
     <PackageReleaseNotes>
       Add URI config option and logging CreateConnection overloads
     </PackageReleaseNotes>
@@ -31,11 +32,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Polly" Version="8.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="RethinkDb.Driver" Version="2.*" />
-    <PackageReference Update="FSharp.Core" Version="9.0.100" />
+    <PackageReference Update="FSharp.Core" Version="6.0.3" />
   </ItemGroup>
 
 </Project>