Fix tryFinally

Author: gusty

src/FSharpPlus/Extensions/Task.fs

@@ -348,17 +348,25 @@ module Task =
             try body ()
             with
             | _ ->
-                compensation ()
-                reraise ()
+                try
+                    compensation ()
+                    reraise ()
+                with e -> Task.FromException<'T> e
         if task.IsCompleted then
             let res =
-                try
-                    task.GetAwaiter().GetResult ()
+                try Ok (task.GetAwaiter().GetResult ())
                 with _ ->
+                    try
+                        compensation ()
+                        reraise ()
+                    with e -> Error e
+            match res with
+            | Error e -> Task.FromException<'T> e
+            | Ok v ->
+                try
                     compensation ()
-                    reraise ()
-            compensation ()
-            result res
+                    Task.FromResult v
+                with e -> Task.FromException<'T> e
         else
             task.ContinueWith(fun (x: Task<'T>) -> tryFinally (fun () -> x) compensation).Unwrap ()
 

src/FSharpPlus/Extensions/ValueTask.fs

@@ -323,17 +323,25 @@ module ValueTask =
             try body ()
             with
             | _ ->
-                compensation ()
-                reraise ()
+                try
+                    compensation ()
+                    reraise ()
+                with e -> ValueTask.FromException<'T> e
         if task.IsCompleted then
             let res =
-                try
-                    task.GetAwaiter().GetResult ()
+                try Ok (task.GetAwaiter().GetResult ())
                 with _ ->
+                    try
+                        compensation ()
+                        reraise ()
+                    with e -> Error e
+            match res with
+            | Error e -> ValueTask.FromException<'T> e
+            | Ok v ->
+                try
                     compensation ()
-                    reraise ()
-            compensation ()
-            result res
+                    ValueTask.FromResult v
+                with e -> ValueTask.FromException<'T> e
         else
             task.AsTask().ContinueWith(fun (x: Task<'T>) -> Task.tryFinally compensation (fun () -> x)).Unwrap () |> ValueTask<'T>