Merge pull request #7197 from dotnet/merges/master-to-release/dev16.3

Merge master to release/dev16.3

Author: KevinRansom

NuGet.config

@@ -8,6 +8,20 @@
     <clear />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
+    <add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
+    <add key="myget-dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+    <add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
+    <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
+    <add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
+    <add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
+    <add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
+    <add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
+    <add key="vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
+    <add key="vs-impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
+    <add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
+    <add key="devcore" value="https://vside.myget.org/F/devcore/api/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

tests/fsharp/Compiler/CompilerAssert.fs

@@ -111,7 +111,8 @@ module CompilerAssert =
             Assert.IsEmpty(typeCheckResults.Errors, sprintf "Type Check errors: %A" typeCheckResults.Errors)
 
 
-    let TypeCheckSingleError (source: string) (expectedErrorNumber: int) (expectedErrorRange: int * int * int * int) (expectedErrorMsg: string) =
+    
+    let TypeCheckWithErrors (source: string) expectedTypeErrors =
         lock gate <| fun () ->
             let parseResults, fileAnswer = checker.ParseAndCheckFileInProject("test.fs", 0, SourceText.ofString source, defaultProjectOptions) |> Async.RunSynchronously
 
@@ -121,15 +122,24 @@ module CompilerAssert =
             | FSharpCheckFileAnswer.Aborted _ -> Assert.Fail("Type Checker Aborted")
             | FSharpCheckFileAnswer.Succeeded(typeCheckResults) ->
 
-            Assert.AreEqual(1, typeCheckResults.Errors.Length, sprintf "Expected one type check error: %A" typeCheckResults.Errors)
-            typeCheckResults.Errors
-            |> Array.iter (fun info ->
-                Assert.AreEqual(FSharpErrorSeverity.Error, info.Severity)
+            let errors = 
+                typeCheckResults.Errors
+                |> Array.distinctBy (fun e -> e.Severity, e.ErrorNumber, e.StartLineAlternate, e.StartColumn, e.EndLineAlternate, e.EndColumn, e.Message)
+
+            Assert.AreEqual(Array.length expectedTypeErrors, errors.Length, sprintf "Type check errors: %A" typeCheckResults.Errors)
+
+            Array.zip errors expectedTypeErrors
+            |> Array.iter (fun (info, expectedError) ->
+                let (expectedServerity: FSharpErrorSeverity, expectedErrorNumber: int, expectedErrorRange: int * int * int * int, expectedErrorMsg: string) = expectedError
+                Assert.AreEqual(expectedServerity, info.Severity)
                 Assert.AreEqual(expectedErrorNumber, info.ErrorNumber, "expectedErrorNumber")
-                Assert.AreEqual(expectedErrorRange, (info.StartLineAlternate, info.StartColumn, info.EndLineAlternate, info.EndColumn), "expectedErrorRange")
+                Assert.AreEqual(expectedErrorRange, (info.StartLineAlternate, info.StartColumn + 1, info.EndLineAlternate, info.EndColumn + 1), "expectedErrorRange")
                 Assert.AreEqual(expectedErrorMsg, info.Message, "expectedErrorMsg")
             )
 
+    let TypeCheckSingleError (source: string) (expectedServerity: FSharpErrorSeverity) (expectedErrorNumber: int) (expectedErrorRange: int * int * int * int) (expectedErrorMsg: string) =
+        TypeCheckWithErrors (source: string) [| expectedServerity, expectedErrorNumber, expectedErrorRange, expectedErrorMsg |]
+
     let CompileExe (source: string) =
         compile true source (fun (errors, _) -> 
             if errors.Length > 0 then
@@ -203,4 +213,4 @@ module CompilerAssert =
                 ||> Seq.iter2 (fun expectedErrorMessage errorMessage ->
                     Assert.AreEqual(expectedErrorMessage, errorMessage)
                 )
-        
+        

tests/fsharp/Compiler/Language/AnonRecordTests.fs

@@ -3,6 +3,7 @@
 namespace FSharp.Compiler.UnitTests
 
 open NUnit.Framework
+open FSharp.Compiler.SourceCodeServices
 
 [<TestFixture>]
 module AnonRecordsTests =
@@ -30,8 +31,9 @@ let sAnon = StructClass<struct {| S: int |}>()
 type RefClass<'a when 'a : not struct>() = class end
 let rAnon = RefClass<struct {| R: int |}>()
             """ 
+            FSharpErrorSeverity.Error
             1
-            (3, 12, 3, 41)
+            (3, 13, 3, 42)
             "A generic construct requires that the type 'struct {|R : int|}' have reference semantics, but it does not, i.e. it is a struct"
 
     [<Test>]
@@ -40,7 +42,8 @@ let rAnon = RefClass<struct {| R: int |}>()
             """
 type StructClass<'a when 'a : struct>() = class end
 let sAnon = StructClass<{| S: int |}>()
-            """ 
+            """
+            FSharpErrorSeverity.Error
             1
-            (3, 12, 3, 37)
+            (3, 13, 3, 38)
             "A generic construct requires that the type '{|S : int|}' is a CLI or F# struct type"