Merge master to release/dev16.8

src/fsharp/FSharp.Core/async.fs

@@ -1405,7 +1405,6 @@ namespace Microsoft.FSharp.Control
         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"))

src/fsharp/FSharp.Core/async.fsi

@@ -288,7 +288,6 @@ namespace Microsoft.FSharp.Control
         /// <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 

src/fsharp/FSharp.Core/map.fs

@@ -549,7 +549,6 @@ type Map<[<EqualityConditionalOn>]'Key, [<EqualityConditionalOn; ComparisonCondi
 #endif
         new Map<'Key, 'Value>(comparer, MapTree.add comparer key value tree)
 
-    [<Experimental("Experimental library feature, requires '--langversion:preview'")>]
     member m.Change(key, f) : Map<'Key, 'Value> =
         new Map<'Key, 'Value>(comparer, MapTree.change comparer key f tree)
 
@@ -770,7 +769,6 @@ module Map =
     let add key value (table: Map<_, _>) =
         table.Add (key, value)
 
-    [<Experimental("Experimental library feature, requires '--langversion:preview'")>]
     [<CompiledName("Change")>]
     let change key f (table: Map<_, _>) =
         table.Change (key, f)

src/fsharp/FSharp.Core/map.fsi

@@ -26,7 +26,6 @@ namespace Microsoft.FSharp.Collections
         /// <param name="key">The input key.</param>
         /// <param name="f">The change function.</param>
         /// <returns>The resulting map.</returns>
-        [<Experimental("Experimental library feature, requires '--langversion:preview'")>]
         member Change: key:'Key * f:('Value option -> 'Value option) -> Map<'Key,'Value>
 
         /// <summary>Returns true if there are no bindings in the map.</summary>
@@ -98,7 +97,6 @@ namespace Microsoft.FSharp.Collections
         /// <param name="f">The change function.</param>
         /// <param name="table">The input map.</param>
         /// <returns>The resulting map.</returns>
-        [<Experimental("Experimental library feature, requires '--langversion:preview'")>]
         [<CompiledName("Change")>]
         val change: key:'Key -> f:('T option -> 'T option) -> table:Map<'Key,'T> -> Map<'Key,'T>
 

src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs

@@ -103,22 +103,22 @@ module FSharpDependencyManager =
 type ResolveDependenciesResult (success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) =
 
     /// Succeded?
-    member __.Success = success
+    member _.Success = success
 
     /// The resolution output log
-    member __.StdOut = stdOut
+    member _.StdOut = stdOut
 
     /// The resolution error log (* process stderror *)
-    member __.StdError = stdError
+    member _.StdError = stdError
 
     /// The resolution paths
-    member __.Resolutions = resolutions
+    member _.Resolutions = resolutions
 
     /// The source code file paths
-    member __.SourceFiles = sourceFiles
+    member _.SourceFiles = sourceFiles
 
     /// The roots to package directories
-    member __.Roots = roots
+    member _.Roots = roots
 
 [<DependencyManagerAttribute>] 
 type FSharpDependencyManager (outputDir:string option) =
@@ -159,11 +159,11 @@ type FSharpDependencyManager (outputDir:string option) =
 
     do if deleteAtExit then AppDomain.CurrentDomain.ProcessExit |> Event.add(fun _ -> deleteScripts () )
 
-    member __.Name = name
+    member _.Name = name
 
-    member __.Key = key
+    member _.Key = key
 
-    member __.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj =
+    member _.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj =
 
         let scriptExt, poundRprefix  =
             match scriptExt with

src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs

@@ -128,37 +128,37 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn
     static member MakeResultFromObject(result: obj) = {
         new IResolveDependenciesResult with
             /// Succeded?
-            member __.Success =
+            member _.Success =
                 match getInstanceProperty<bool> (result.GetType()) "Success" with
                 | None -> false
                 | Some p -> p.GetValue(result) :?> bool
 
             /// The resolution output log
-            member __.StdOut =
+            member _.StdOut =
                 match getInstanceProperty<string array> (result.GetType()) "StdOut" with
                 | None -> Array.empty<string>
                 | Some p -> p.GetValue(result) :?> string array
 
             /// The resolution error log (* process stderror *)
-            member __.StdError =
+            member _.StdError =
                 match getInstanceProperty<string array> (result.GetType()) "StdError" with
                 | None -> Array.empty<string>
                 | Some p -> p.GetValue(result) :?> string array
 
             /// The resolution paths
-            member __.Resolutions =
+            member _.Resolutions =
                 match getInstanceProperty<string seq> (result.GetType()) "Resolutions" with
                 | None -> Seq.empty<string>
                 | Some p -> p.GetValue(result) :?> string seq
 
             /// The source code file paths
-            member __.SourceFiles =
+            member _.SourceFiles =
                 match getInstanceProperty<string seq> (result.GetType()) "SourceFiles" with
                 | None -> Seq.empty<string>
                 | Some p -> p.GetValue(result) :?> string seq
 
             /// The roots to package directories
-            member __.Roots =
+            member _.Roots =
                 match getInstanceProperty<string seq> (result.GetType()) "Roots" with
                 | None -> Seq.empty<string>
                 | Some p -> p.GetValue(result) :?> string seq
@@ -167,32 +167,32 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn
     static member MakeResultFromFields(success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) = {
         new IResolveDependenciesResult with
             /// Succeded?
-            member __.Success = success
+            member _.Success = success
 
             /// The resolution output log
-            member __.StdOut = stdOut
+            member _.StdOut = stdOut
 
             /// The resolution error log (* process stderror *)
-            member __.StdError = stdError
+            member _.StdError = stdError
 
             /// The resolution paths
-            member __.Resolutions = resolutions
+            member _.Resolutions = resolutions
 
             /// The source code file paths
-            member __.SourceFiles = sourceFiles
+            member _.SourceFiles = sourceFiles
 
             /// The roots to package directories
-            member __.Roots = roots
+            member _.Roots = roots
         }
 
 
     interface IDependencyManagerProvider with
 
         /// Name of dependency Manager
-        member __.Name = instance |> nameProperty
+        member _.Name = instance |> nameProperty
 
         /// Key of dependency Manager: used for #r "key: ... "   E.g nuget
-        member __.Key = instance |> keyProperty
+        member _.Key = instance |> keyProperty
 
         /// Resolve the dependencies for the given arguments
         member this.ResolveDependencies(scriptDir, mainScriptName, scriptName, scriptExt, packageManagerTextLines, tfm, rid): IResolveDependenciesResult =
@@ -302,7 +302,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
         new DependencyProvider(Unchecked.defaultof<AssemblyResolutionProbe>, nativeProbingRoots)
 
     /// Returns a formatted error message for the host to present
-    member __.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) =
+    member _.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) =
         let registeredKeys = String.Join(", ", RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError |> Seq.map (fun kv -> kv.Value.Key))
         let searchPaths = assemblySearchPaths.Force()
         DependencyManager.SR.packageManagerUnknown(packageManagerKey, String.Join(", ", searchPaths, compilerTools), registeredKeys)
@@ -330,12 +330,12 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
             null, Unchecked.defaultof<IDependencyManagerProvider>
 
     /// Remove the dependency mager with the specified key
-    member __.RemoveDependencyManagerKey(packageManagerKey:string, path:string): string =
+    member _.RemoveDependencyManagerKey(packageManagerKey:string, path:string): string =
 
         path.Substring(packageManagerKey.Length + 1).Trim()
 
     /// Fetch a dependencymanager that supports a specific key
-    member __.TryFindDependencyManagerByKey (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, key: string): IDependencyManagerProvider =
+    member _.TryFindDependencyManagerByKey (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, key: string): IDependencyManagerProvider =
 
         try
             RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError
@@ -350,7 +350,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
             Unchecked.defaultof<IDependencyManagerProvider>
 
     /// Resolve reference for a list of package manager lines
-    member __.Resolve (packageManager:IDependencyManagerProvider,
+    member _.Resolve (packageManager:IDependencyManagerProvider,
                        scriptExt: string,
                        packageManagerTextLines: string seq,
                        reportError: ResolvingErrorReport,
@@ -376,7 +376,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr
 
     interface IDisposable with
 
-        member __.Dispose() =
+        member _.Dispose() =
 
             // Unregister everything
             registeredDependencyManagers <- None