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

Merge master to release/dev16.7

Author: KevinRansom

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20301.10">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20302.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e4cb18bd64d291e5dc34e2f77317c33d5022a6b8</Sha>
+      <Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

fcs/global.json

@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.100"
+    "version": "3.1.200",
+    "rollForward":"minor"
   }
 }

global.json

@@ -1,16 +1,15 @@
 {
   "tools": {
-    "dotnet": "3.1.100",
+    "dotnet": "3.1.200",
     "vs": {
-      "version": "16.3",
+      "version": "16.4",
       "components": [
-        "Microsoft.Net.Core.Component.SDK.2.1",
         "Microsoft.VisualStudio.Component.FSharp"
       ]
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

src/absil/ilreflect.fs

@@ -325,9 +325,12 @@ type cenv =
 
 let convResolveAssemblyRef (cenv: cenv) (asmref: ILAssemblyRef) qualifiedName =
     let assembly = 
-        match cenv.resolveAssemblyRef asmref with                     
+        match cenv.resolveAssemblyRef asmref with
         | Some (Choice1Of2 path) ->
-            FileSystem.AssemblyLoadFrom path              
+            // asmRef is a path but the runtime is smarter with assembly names so make one
+            let asmName = AssemblyName.GetAssemblyName(path)
+            asmName.CodeBase <- path
+            FileSystem.AssemblyLoad asmName
         | Some (Choice2Of2 assembly) ->
             assembly
         | None ->
@@ -359,8 +362,6 @@ let convTypeRefAux (cenv: cenv) (tref: ILTypeRef) =
     | ILScopeRef.PrimaryAssembly ->
         convResolveAssemblyRef cenv cenv.ilg.primaryAssemblyRef qualifiedName
 
-
-
 /// The (local) emitter env (state). Some of these fields are effectively global accumulators
 /// and could be placed as hash tables in the global environment.
 [<AutoSerializable(false)>]

src/fsharp/FSharp.Core/async.fs

@@ -2809,11 +2809,18 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i
 
     let fsiInteractionProcessor = FsiInteractionProcessor(fsi, tcConfigB, fsiOptions, fsiDynamicCompiler, fsiConsolePrompt, fsiConsoleOutput, fsiInterruptController, fsiStdinLexerProvider, lexResourceManager, initialInteractiveState) 
 
+    // Raising an exception throws away the exception stack making diagnosis hard
+    // this wraps the existing exception as the inner exception
+    let makeNestedException (userExn: #Exception) =
+        // clone userExn -- make userExn the inner exception, to retain the stacktrace on raise
+        let arguments = [| userExn.Message :> obj; userExn :> obj |]
+        Activator.CreateInstance(userExn.GetType(), arguments) :?> Exception
+
     let commitResult res =
         match res with
         | Choice1Of2 r -> r
         | Choice2Of2 None -> raise (FsiCompilationException(FSIstrings.SR.fsiOperationFailed(), None))
-        | Choice2Of2 (Some userExn) -> raise userExn
+        | Choice2Of2 (Some userExn) -> raise (makeNestedException userExn)
 
     let commitResultNonThrowing errorOptions scriptFile (errorLogger: CompilationErrorLogger) res =
         let errs = errorLogger.GetErrors()

src/fsharp/fsi/fsi.fs

@@ -4011,8 +4011,8 @@ atomicExpr:
   | GLOBAL
       { SynExpr.Ident (ident(MangledGlobalName, rhs parseState 1)), false }
 
-  | nameop
-      { SynExpr.Ident ($1), false }
+  | identExpr
+      { $1, false }
 
   | LBRACK listExprElements RBRACK 
       { $2 (lhs parseState) false, false }
@@ -5334,6 +5334,16 @@ pathOp:
 nameop: 
   | identOrOp { $1 } 
 
+identExpr:
+  | ident
+     { SynExpr.Ident($1) }
+
+  | opName
+     { let m = lhs parseState
+       let mLparen = mkFileIndexRange m.FileIndex m.Start (mkPos m.StartLine (m.StartColumn + 1))
+       let mRparen = mkFileIndexRange m.FileIndex (mkPos m.EndLine (m.EndColumn - 1)) m.End
+       SynExpr.Paren(SynExpr.Ident($1), mLparen, Some mRparen, m) }
+
 topSeparator: 
   | SEMICOLON { } 
   | SEMICOLON_SEMICOLON { }

src/fsharp/pars.fsy

@@ -46,6 +46,7 @@ module internal NoteworthyParamInfoLocationsImpl =
         | SynExpr.LongIdent (_, LongIdentWithDots(lid, _), _, lidRange) 
         | SynExpr.DotGet (_, _, LongIdentWithDots(lid, _), lidRange) -> Some (pathOfLid lid, lidRange)
         | SynExpr.TypeApp (synExpr, _, _synTypeList, _commas, _, _, _range) -> digOutIdentFromFuncExpr synExpr 
+        | SynExpr.Paren(expr = expr) -> digOutIdentFromFuncExpr expr 
         | _ -> None
 
     type FindResult = 

src/fsharp/service/ServiceParamInfoLocations.fs

@@ -533,22 +533,37 @@ type AsyncType() =
 
     [<Test>]
     member this.NonGenericTaskAsyncValueCancellation () =
-        use ewh = new ManualResetEvent(false)    
+        use ewh = new ManualResetEvent(false)
         let cts = new CancellationTokenSource()
         let token = cts.Token
 #if !NET46
-        let t = 
+        let t =
 #else
         use t =
-#endif   
+#endif
             Task.Factory.StartNew(Action(fun () -> while not token.IsCancellationRequested do ()), token)
-        let cancelled = ref true
         let a = async {
                     use! _holder = Async.OnCancel(fun _ -> ewh.Set() |> ignore)
                     let! v = Async.AwaitTask(t)
                     return v
-            }        
+            }
         Async.Start a
         cts.Cancel()
-        ewh.WaitOne(10000) |> ignore        
+        ewh.WaitOne(10000) |> ignore
 
+    [<Test>]
+    member this.CancellationExceptionThrown () =
+        use ewh = new ManualResetEventSlim(false)
+        let cts = new CancellationTokenSource()
+        let token = cts.Token
+        let mutable hasThrown = false
+        token.Register(fun () -> ewh.Set() |> ignore) |> ignore
+        let a = async {
+            try
+                while true do token.ThrowIfCancellationRequested()
+            with _ -> hasThrown <- true
+        }
+        Async.Start(a, token)
+        cts.Cancel()
+        ewh.Wait(10000) |> ignore
+        Assert.False hasThrown

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

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.UnitTests
+
+open NUnit.Framework
+open FSharp.TestHelpers
+
+module ``Dictionary Tests`` =
+
+    [<Test>]
+    let ``Assigning to dictionary should compile``() =
+        // Regression test for FSHARP1.0:5365
+
+        CompilerAssert.Pass
+            """
+module N.M
+
+    open System
+    open System.Collections.Generic
+
+    type ICloneable<'a> =
+        abstract Clone : unit -> 'a
+
+    type DictionaryFeature<'key> (dict: IDictionary<'key, int>) =
+        member this.Add key value =
+            dict.[key] <- value
+            """
+
+    [<Test>]
+    let ``Assigning to dictionary with type constraint should compile``() =
+        // Regression test for FSHARP1.0:5365
+        // Used to give error: value must be local and mutable in order to mutate the contents of a value type, e.g. 'let mutable x = ...'
+
+        CompilerAssert.Pass
+            """
+module N.M
+
+    open System
+    open System.Collections.Generic
+
+    type ICloneable<'a> =
+        abstract Clone : unit -> 'a
+
+    type DictionaryFeature<'key, 'dict when 'dict :> IDictionary<'key, int> and 'dict :> ICloneable<'dict>> (dict: 'dict) =
+        member this.Add key value =
+            dict.[key] <- value  
+            """

tests/fsharp/Compiler/Libraries/Core/ExtraTopLevelOperators/DictionaryTests.fs

@@ -79,6 +79,7 @@
     <Compile Include="Compiler\Libraries\Core\Collections\MapTests.fs" />
     <Compile Include="Compiler\Libraries\Core\Collections\CollectionTests.fs" />
     <Compile Include="Compiler\Libraries\Core\Collections\ListTests.fs" />
+    <Compile Include="Compiler\Libraries\Core\ExtraTopLevelOperators\DictionaryTests.fs" />
     <None Include="app.config" />
     <None Include="update.base.line.with.actuals.fsx" />