Merge pull request #9208 from dotnet/merges/master-to-release/dev16.7

Merge master to release/dev16.7

Author: KevinRansom

src/fsharp/FSharp.Core/async.fs

@@ -1368,7 +1368,7 @@ namespace Microsoft.FSharp.Control
             let cancellationToken = defaultArg cancellationToken defaultCancellationTokenSource.Token
             AsyncPrimitives.StartWithContinuations cancellationToken computation id (fun edi -> edi.ThrowAny()) ignore
 
-        static member Sleep millisecondsDueTime : Async<unit> =
+        static member Sleep (millisecondsDueTime: int64) : Async<unit> =
             CreateDelimitedUserCodeAsync (fun ctxt ->
                 let mutable timer = None: Timer option
                 let cont = ctxt.cont
@@ -1401,7 +1401,7 @@ namespace Microsoft.FSharp.Control
                                             | Some t -> t.Dispose()
                                             // Now we're done, so call the continuation
                                             ctxt.trampolineHolder.ExecuteWithTrampoline (fun () -> cont()) |> unfake),
-                                     null, dueTime=millisecondsDueTime, period = -1) |> Some
+                                     null, dueTime=millisecondsDueTime, period = -1L) |> Some
                 with exn ->
                     if latch.Enter() then
                         // post exception to econt only if we successfully enter the latch (no other continuations were called)
@@ -1413,6 +1413,16 @@ namespace Microsoft.FSharp.Control
                 | _ ->
                     ctxt.econt edi)
 
+        static member Sleep (millisecondsDueTime: int32) : Async<unit> =
+            Async.Sleep (millisecondsDueTime |> int64)
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        static member Sleep (dueTime: TimeSpan) =
+            if dueTime < TimeSpan.Zero then
+                raise (ArgumentOutOfRangeException("dueTime"))
+            else
+                Async.Sleep (dueTime.TotalMilliseconds |> Checked.int64)
+
         /// Wait for a wait handle. Both timeout and cancellation are supported
         static member AwaitWaitHandle(waitHandle: WaitHandle, ?millisecondsTimeout:int) =
             let millisecondsTimeout = defaultArg millisecondsTimeout Threading.Timeout.Infinite

src/fsharp/FSharp.Core/async.fsi

@@ -282,6 +282,15 @@ namespace Microsoft.FSharp.Control
         /// and not infinite.</exception>
         static member Sleep: millisecondsDueTime:int -> Async<unit>
 
+        /// <summary>Creates an asynchronous computation that will sleep for the given time. This is scheduled
+        /// using a System.Threading.Timer object. The operation will not block operating system threads
+        /// for the duration of the wait.</summary>
+        /// <param name="dueTime">The amount of time to sleep.</param>
+        /// <returns>An asynchronous computation that will sleep for the given time.</returns>
+        /// <exception cref="System.ArgumentOutOfRangeException">Thrown when the due time is negative.</exception>
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        static member Sleep: dueTime:TimeSpan -> Async<unit>
+
         /// <summary>Creates an asynchronous computation in terms of a Begin/End pair of actions in 
         /// the style used in CLI APIs. For example, 
         ///     <c>Async.FromBeginEnd(ws.BeginGetWeather,ws.EndGetWeather)</c>

src/fsharp/FSharp.Core/prim-types.fsi

@@ -616,6 +616,11 @@ namespace Microsoft.FSharp.Core
         /// <summary>Indicates one or more adjustments to the compiled representation of an F# type or member</summary>
         member Flags : CompilationRepresentationFlags
 
+    module internal ExperimentalAttributeMessages = begin
+        [<Literal>]
+        val RequiresPreview : string = "Experimental library feature, requires '--langversion:preview'"
+    end
+        
     /// <summary>This attribute is used to tag values that are part of an experimental library
     /// feature.</summary>
     [<AttributeUsage (AttributeTargets.All,AllowMultiple=false)>]

tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs

@@ -63,7 +63,7 @@ module ChoiceUtils =
     let runChoice (ChoiceWorkflow(ops, cancelAfter)) =
         // Step 1. build a choice workflow from the abstract representation
         let completed = ref 0
-        let returnAfter time f = async {
+        let returnAfter (time: int) f = async {
             do! Async.Sleep time
             let _ = Interlocked.Increment completed
             return f ()

tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs

@@ -89,9 +89,15 @@ type AsyncType() =
         Async.RunSynchronously(computation, timeout = 1000) |> ignore
 
     [<Test>]
-    member this.AsyncSleepCancellation1() =
+    [<TestCase("int32")>]
+    [<TestCase("timespan")>]
+    member this.AsyncSleepCancellation1(sleepType) =
         ignoreSynchCtx (fun () ->
-            let computation = Async.Sleep(10000000)
+            let computation =
+                match sleepType with
+                | "int32"    -> Async.Sleep(10000000)
+                | "timespan" -> Async.Sleep(10000000.0 |> TimeSpan.FromMilliseconds)
+                | unknown    -> raise (NotImplementedException(unknown))
             let result = ref ""
             use cts = new CancellationTokenSource()
             Async.StartWithContinuations(computation,
@@ -105,9 +111,15 @@ type AsyncType() =
         )
 
     [<Test>]
-    member this.AsyncSleepCancellation2() =
+    [<TestCase("int32")>]
+    [<TestCase("timespan")>]
+    member this.AsyncSleepCancellation2(sleepType) =
         ignoreSynchCtx (fun () ->
-            let computation = Async.Sleep(10)
+            let computation =
+                match sleepType with
+                | "int32"    -> Async.Sleep(10)
+                | "timespan" -> Async.Sleep(10.0 |> TimeSpan.FromMilliseconds)
+                | unknown    -> raise (NotImplementedException(unknown))
             for i in 1..100 do
                 let result = ref ""
                 use completedEvent = new ManualResetEvent(false)
@@ -123,6 +135,36 @@ type AsyncType() =
                 Assert.IsTrue(!result = "Cancel" || !result = "Ok")
         )
 
+    [<Test>]
+    [<TestCase("int32")>]
+    [<TestCase("timespan")>]
+    member this.AsyncSleepThrowsOnNegativeDueTimes(sleepType) =
+        async {
+            try
+                do! match sleepType with
+                    | "int32"    -> Async.Sleep(-100)
+                    | "timespan" -> Async.Sleep(-100.0 |> TimeSpan.FromMilliseconds)
+                    | unknown    -> raise (NotImplementedException(unknown))
+                failwith "Expected ArgumentOutOfRangeException"
+            with
+            | :? ArgumentOutOfRangeException -> ()
+        } |> Async.RunSynchronously
+
+    [<Test>]
+    member this.AsyncSleepInfinitely() =
+        ignoreSynchCtx (fun () ->
+            let computation = Async.Sleep(System.Threading.Timeout.Infinite)
+            let result = TaskCompletionSource()
+            use cts = new CancellationTokenSource(TimeSpan.FromSeconds(1.0)) // there's a long way from 1 sec to infinity, but it'll have to do.
+            Async.StartWithContinuations(computation,
+                                            (fun _ -> result.TrySetResult("Ok")        |> ignore),
+                                            (fun _ -> result.TrySetResult("Exception") |> ignore),
+                                            (fun _ -> result.TrySetResult("Cancel")    |> ignore),
+                                            cts.Token)
+            let result = result.Task |> Async.AwaitTask |> Async.RunSynchronously
+            Assert.AreEqual("Cancel", result)
+        )
+
     member private this.WaitASec (t:Task) =
         let result = t.Wait(TimeSpan(hours=0,minutes=0,seconds=1))
         Assert.IsTrue(result, "Task did not finish after waiting for a second.")

tests/FSharp.Core.UnitTests/SurfaceArea.coreclr.fs

@@ -538,6 +538,7 @@ Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Mic
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] AwaitTask(System.Threading.Tasks.Task)
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] Ignore[T](Microsoft.FSharp.Control.FSharpAsync`1[T])
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] Sleep(Int32)
+Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] Sleep(System.TimeSpan)
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] SwitchToContext(System.Threading.SynchronizationContext)
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] SwitchToNewThread()
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] SwitchToThreadPool()

tests/FSharp.Core.UnitTests/SurfaceArea.net40.fs

@@ -538,6 +538,7 @@ Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Mic
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] AwaitTask(System.Threading.Tasks.Task)
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] Ignore[T](Microsoft.FSharp.Control.FSharpAsync`1[T])
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] Sleep(Int32)
+Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] Sleep(System.TimeSpan)
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] SwitchToContext(System.Threading.SynchronizationContext)
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] SwitchToNewThread()
 Microsoft.FSharp.Control.FSharpAsync: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Core.Unit] SwitchToThreadPool()

tests/fsharpqa/Source/Printing/SignatureWithOptionalArgs01.fs

@@ -15,7 +15,7 @@ open Microsoft.FSharp.Control
 
 type AsyncTimer(f, ?delay ) =
   let mutable does_again = true
-  let mutable delay = delay
+  let mutable delay: int option = delay
 
   member t.Delay 
     with get() = delay