Merge release/dev16.2 to master

.vsconfig

@@ -0,0 +1,30 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Component.CoreEditor",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Component.NuGet",
+    "Microsoft.Net.Component.4.6.1.TargetingPack",
+    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
+    "Microsoft.VisualStudio.Component.FSharp",
+    "Microsoft.Net.Core.Component.SDK.2.1",
+    "Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1",
+    "Microsoft.Net.Component.4.7.2.SDK",
+    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.VisualStudio.Component.TextTemplating",
+    "Microsoft.VisualStudio.Component.SQL.CLR",
+    "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
+    "Microsoft.Net.Component.4.6.TargetingPack",
+    "Component.Microsoft.VisualStudio.LiveShare",
+    "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
+    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
+    "Microsoft.VisualStudio.Component.FSharp.Desktop",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.VisualStudio.Component.VSSDK",
+    "Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
+    "Microsoft.VisualStudio.Workload.VisualStudioExtension"
+  ]
+}

DEVGUIDE.md

@@ -70,9 +70,7 @@ To build and test Visual F# IDE Tools, install these requirements:
 - Launch the Visual Studio Installer
   - Under the **"Windows"** workload, select **".NET desktop development"**
     - Select the optional component **"F# desktop language support"**
-  - Under the **"Mobile & Gaming"** workload, select **"Mobile development with .NET"**
   - Under the **"Other Toolsets"** workload, select **"Visual Studio extension development"**
-  - On the **"Individual Components"** tab, select **".NET Framework 4.7.2 SDK"** and **".NET Framework 4.7.2 targeting pack"**
 
 Steps to build:
 

eng/Build.ps1

@@ -46,8 +46,10 @@ param (
     [switch]$warnAsError = $true,
     [switch][Alias('test')]$testDesktop,
     [switch]$testCoreClr,
-    [switch]$testFSharpQA,
+    [switch]$testCambridge,
+    [switch]$testCompiler,
     [switch]$testFSharpCore,
+    [switch]$testFSharpQA,
     [switch]$testVs,
     [switch]$testAll,
 
@@ -75,10 +77,12 @@ function Print-Usage() {
     Write-Host ""
     Write-Host "Test actions"
     Write-Host "  -testAll                  Run all tests"
+    Write-Host "  -testCambridge            Run Cambridge tests"
+    Write-Host "  -testCompiler             Run FSharpCompiler unit tests"
     Write-Host "  -testDesktop              Run tests against full .NET Framework"
     Write-Host "  -testCoreClr              Run tests against CoreCLR"
-    Write-Host "  -testFSharpQA             Run F# Cambridge tests"
     Write-Host "  -testFSharpCore           Run FSharpCore unit tests"
+    Write-Host "  -testFSharpQA             Run F# Cambridge tests"
     Write-Host "  -testVs                   Run F# editor unit tests"
     Write-Host ""
     Write-Host "Advanced settings:"
@@ -279,16 +283,21 @@ try {
     }
 
     if ($testFSharpCore) {
-        Write-Host "Environment Variables"
-        Get-Childitem Env:
         TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
         TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
     }
 
+    if ($testCompiler) {
+        TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
+        TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
+    }
+
+    if ($testCambridge) {
+        TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $desktopTargetFramework
+        TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $coreclrTargetFramework
+    }
 
     if ($testVs) {
-        Write-Host "Environment Variables"
-        Get-Childitem Env:
         TestUsingNUnit -testProject "$RepoRoot\vsintegration\tests\GetTypesVS.UnitTests\GetTypesVS.UnitTests.fsproj" -targetFramework $desktopTargetFramework
         TestUsingNUnit -testProject "$RepoRoot\vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" -targetFramework $desktopTargetFramework
     }

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -93,6 +93,12 @@
     <Compile Include="$(FSharpSourcesRoot)/utils/prim-parsing.fs">
       <Link>LexYaccRuntime/prim-parsing.fs</Link>
     </Compile>
+    <Compile Include="$(FSharpSourcesRoot)/utils/PathMap.fsi">
+      <Link>Utilities/PathMap.fsi</Link>
+    </Compile>
+    <Compile Include="$(FSharpSourcesRoot)/utils/PathMap.fs">
+      <Link>Utilities/PathMap.fs</Link>
+    </Compile>
     <Compile Include="$(FSharpSourcesRoot)/utils/ResizeArray.fsi">
       <Link>Utilities/ResizeArray.fsi</Link>
     </Compile>
@@ -428,6 +434,9 @@
     <Compile Include="$(FSharpSourcesRoot)/fsharp/CheckFormatStrings.fs">
       <Link>Logic/CheckFormatStrings.fs</Link>
     </Compile>
+    <Compile Include="$(FSharpSourcesRoot)/fsharp/FindUnsolved.fsi">
+      <Link>Logic/FindUnsolved.fsi</Link>
+    </Compile>
     <Compile Include="$(FSharpSourcesRoot)/fsharp/FindUnsolved.fs">
       <Link>Logic/FindUnsolved.fs</Link>
     </Compile>
@@ -467,9 +476,15 @@
     <Compile Include="$(FSharpSourcesRoot)/fsharp/InnerLambdasToTopLevelFuncs.fs">
       <Link>Optimize/InnerLambdasToTopLevelFuncs.fs</Link>
     </Compile>
+    <Compile Include="$(FSharpSourcesRoot)/fsharp/LowerCallsAndSeqs.fsi">
+      <Link>Optimize/LowerCallsAndSeqs.fsi</Link>
+    </Compile>
     <Compile Include="$(FSharpSourcesRoot)/fsharp/LowerCallsAndSeqs.fs">
       <Link>Optimize/LowerCallsAndSeqs.fs</Link>
     </Compile>
+    <Compile Include="$(FSharpSourcesRoot)/fsharp/autobox.fsi">
+      <Link>Optimize/autobox.fsi</Link>
+    </Compile>
     <Compile Include="$(FSharpSourcesRoot)/fsharp/autobox.fs">
       <Link>Optimize/autobox.fs</Link>
     </Compile>

fcs/docsrc/content/filesystem.fsx

@@ -41,7 +41,7 @@ let B = File1.A + File1.A"""
     interface IFileSystem with
         // Implement the service to open files for reading and writing
         member __.FileStreamReadShim(fileName) = 
-            match files.TryGetValue(fileName) with
+            match files.TryGetValue fileName with
             | true, text -> new MemoryStream(Encoding.UTF8.GetBytes(text)) :> Stream
             | _ -> defaultFileSystem.FileStreamReadShim(fileName)
 
@@ -52,7 +52,7 @@ let B = File1.A + File1.A"""
             defaultFileSystem.FileStreamWriteExistingShim(fileName)
 
         member __.ReadAllBytesShim(fileName) = 
-            match files.TryGetValue(fileName) with
+            match files.TryGetValue fileName with
             | true, text -> Encoding.UTF8.GetBytes(text)
             | _ -> defaultFileSystem.ReadAllBytesShim(fileName)
 

fcs/docsrc/content/ja/filesystem.fsx

@@ -41,7 +41,7 @@ let B = File1.A + File1.A"""
     interface IFileSystem with
         // 読み取りおよび書き込み用にファイルをオープンする機能を実装
         member __.FileStreamReadShim(fileName) = 
-            match files.TryGetValue(fileName) with
+            match files.TryGetValue fileName with
             | true, text -> new MemoryStream(Encoding.UTF8.GetBytes(text)) :> Stream
             | _ -> defaultFileSystem.FileStreamReadShim(fileName)
 
@@ -55,7 +55,7 @@ let B = File1.A + File1.A"""
             defaultFileSystem.FileStreamWriteExistingShim(fileName)
 
         member __.ReadAllBytesShim(fileName) = 
-            match files.TryGetValue(fileName) with
+            match files.TryGetValue fileName with
             | true, text -> Encoding.UTF8.GetBytes(text)
             | _ -> defaultFileSystem.ReadAllBytesShim(fileName)
 

src/absil/illib.fs

@@ -985,15 +985,13 @@ type MemoizationTable<'T, 'U>(compute: 'T -> 'U, keyComparer: IEqualityComparer<
 
     member t.Apply x = 
         if (match canMemoize with None -> true | Some f -> f x) then 
-            let mutable res = Unchecked.defaultof<'U>
-            let ok = table.TryGetValue(x, &res)
-            if ok then res 
-            else
+            match table.TryGetValue x with
+            | true, res -> res
+            | _ ->
                 lock table (fun () -> 
-                    let mutable res = Unchecked.defaultof<'U> 
-                    let ok = table.TryGetValue(x, &res)
-                    if ok then res 
-                    else
+                    match table.TryGetValue x with
+                    | true, res -> res
+                    | _ ->
                         let res = compute x
                         table.[x] <- res
                         res)
@@ -1074,11 +1072,10 @@ module Tables =
     let memoize f = 
         let t = new Dictionary<_, _>(1000, HashIdentity.Structural)
         fun x -> 
-            let mutable res = Unchecked.defaultof<_>
-            if t.TryGetValue(x, &res) then 
-                res 
-            else
-                res <- f x
+            match t.TryGetValue x with
+            | true, res -> res
+            | _ ->
+                let res = f x
                 t.[x] <- res
                 res
 

src/absil/ilread.fs

@@ -903,12 +903,11 @@ let mkCacheInt32 lowMem _inbase _nm _sz =
             | null -> cache := new Dictionary<int32, _>(11)
             | _ -> ()
             !cache
-        let mutable res = Unchecked.defaultof<_>
-        let ok = cache.TryGetValue(idx, &res)
-        if ok then 
+        match cache.TryGetValue idx with
+        | true, res ->
             incr count 
             res
-        else 
+        | _ ->
             let res = f idx 
             cache.[idx] <- res 
             res 
@@ -4048,7 +4047,7 @@ let OpenILModuleReader fileName opts =
     let cacheResult2 = 
         // can't used a cached entry when reading PDBs, since it makes the returned object IDisposable
         if keyOk && opts.pdbDirPath.IsNone then 
-            ilModuleReaderCache2.TryGetValue(key)
+            ilModuleReaderCache2.TryGetValue key
         else 
             false, Unchecked.defaultof<_>
 

src/absil/ilreflect.fs

@@ -1500,18 +1500,18 @@ let enablePInvoke = true
 // but we can run on Netcoreapp3.0 so ... use reflection to invoke the api, when we are executing on netcoreapp3.0
 let definePInvokeMethod =
     typeof<TypeBuilder>.GetMethod("DefinePInvokeMethod", [|
-        typeof<string>;
-        typeof<string>;
-        typeof<string>;
-        typeof<System.Reflection.MethodAttributes>;
-        typeof<System.Reflection.CallingConventions>;
-        typeof<Type>;
-        typeof<Type[]>;
-        typeof<Type[]>;
-        typeof<Type[]>;
-        typeof<Type[][]>;
-        typeof<Type[][]>;
-        typeof<System.Runtime.InteropServices.CallingConvention>;
+        typeof<string>
+        typeof<string>
+        typeof<string>
+        typeof<System.Reflection.MethodAttributes>
+        typeof<System.Reflection.CallingConventions>
+        typeof<Type>
+        typeof<Type[]>
+        typeof<Type[]>
+        typeof<Type[]>
+        typeof<Type[][]>
+        typeof<Type[][]>
+        typeof<System.Runtime.InteropServices.CallingConvention>
         typeof<System.Runtime.InteropServices.CharSet> |])
 
 let enablePInvoke = definePInvokeMethod <> null
@@ -2003,9 +2003,6 @@ let createTypeRef (visited: Dictionary<_, _>, created: Dictionary<_, _>) emEnv t
             visited.[tref] <- true
             let tdef = envGetTypeDef emEnv tref
             if verbose2 then dprintf "- traversing type %s\n" typB.FullName
-#if FX_NO_APP_DOMAINS
-            traverseTypeDef tref tdef
-#else
             // This looks like a special case (perhaps bogus) of the dependency logic above, where
             // we require the type r.Name, though with "nestingToProbe" being the enclosing types of the
             // type being defined.
@@ -2029,7 +2026,7 @@ let createTypeRef (visited: Dictionary<_, _>, created: Dictionary<_, _>) emEnv t
                 traverseTypeDef tref tdef
             finally
                System.AppDomain.CurrentDomain.remove_TypeResolve typeCreationHandler
-#endif
+
             // At this point, we've done everything we can to prepare the type for loading by eagerly forcing the
             // load of other types. Everything else is up to the implementation of System.Reflection.Emit.
             if not (created.ContainsKey tref) then 

src/absil/ilwrite.fs

@@ -464,10 +464,9 @@ type MetadataTable<'T> =
 #if DEBUG
         tbl.lookups <- tbl.lookups + 1 
 #endif
-        let mutable res = Unchecked.defaultof<_>
-        let ok = tbl.dict.TryGetValue(x, &res)
-        if ok then res
-        else tbl.AddSharedEntry x
+        match tbl.dict.TryGetValue x with
+        | true, res -> res
+        | _ -> tbl.AddSharedEntry x
 
 
     /// This is only used in one special place - see further below. 
@@ -769,11 +768,12 @@ let rec GetTypeRefAsTypeRefRow cenv (tref: ILTypeRef) =
     SharedRow [| ResolutionScope (rs1, rs2); nelem; nselem |]
 
 and GetTypeRefAsTypeRefIdx cenv tref = 
-    let mutable res = 0
-    if cenv.trefCache.TryGetValue(tref, &res) then res else 
-    let res = FindOrAddSharedRow cenv TableNames.TypeRef (GetTypeRefAsTypeRefRow cenv tref)
-    cenv.trefCache.[tref] <- res
-    res
+    match cenv.trefCache.TryGetValue tref with
+    | true, res -> res
+    | _ ->
+        let res = FindOrAddSharedRow cenv TableNames.TypeRef (GetTypeRefAsTypeRefRow cenv tref)
+        cenv.trefCache.[tref] <- res
+        res
 
 and GetTypeDescAsTypeRefIdx cenv (scoref, enc, n) =  
     GetTypeRefAsTypeRefIdx cenv (mkILNestedTyRef (scoref, enc, n))
@@ -3515,8 +3515,8 @@ let writeDirectory os dict =
 let writeBytes (os: BinaryWriter) (chunk: byte[]) = os.Write(chunk, 0, chunk.Length)  
 
 let writeBinaryAndReportMappings (outfile, 
-                                  ilg: ILGlobals, pdbfile: string option, signer: ILStrongNameSigner option, portablePDB, embeddedPDB, 
-                                  embedAllSource, embedSourceList, sourceLink, emitTailcalls, deterministic, showTimes, dumpDebugInfo )
+                                  ilg: ILGlobals, pdbfile: string option, signer: ILStrongNameSigner option, portablePDB, embeddedPDB,
+                                  embedAllSource, embedSourceList, sourceLink, emitTailcalls, deterministic, showTimes, dumpDebugInfo, pathMap)
                                   modul normalizeAssemblyRefs =
     // Store the public key from the signer into the manifest. This means it will be written 
     // to the binary and also acts as an indicator to leave space for delay sign 
@@ -3671,7 +3671,7 @@ let writeBinaryAndReportMappings (outfile,
             match portablePDB with
             | true -> 
                 let (uncompressedLength, contentId, stream) as pdbStream = 
-                    generatePortablePdb embedAllSource embedSourceList sourceLink showTimes pdbData deterministic
+                    generatePortablePdb embedAllSource embedSourceList sourceLink showTimes pdbData deterministic pathMap
 
                 if embeddedPDB then Some (compressPortablePdbStream uncompressedLength contentId stream)
                 else Some pdbStream
@@ -4211,7 +4211,7 @@ let writeBinaryAndReportMappings (outfile,
                     if embeddedPDB then
                         embedPortablePdbInfo originalLength contentId stream showTimes fpdb debugDataChunk debugEmbeddedPdbChunk
                     else
-                        writePortablePdbInfo contentId stream showTimes fpdb debugDataChunk
+                        writePortablePdbInfo contentId stream showTimes fpdb pathMap debugDataChunk
                 | None ->
 #if FX_NO_PDB_WRITER
                     Array.empty<idd>
@@ -4284,10 +4284,11 @@ type options =
      emitTailcalls : bool
      deterministic : bool
      showTimes: bool
-     dumpDebugInfo: bool }
+     dumpDebugInfo: bool
+     pathMap: PathMap }
 
 let WriteILBinary (outfile, (args: options), modul, normalizeAssemblyRefs) =
     writeBinaryAndReportMappings (outfile, 
                                   args.ilg, args.pdbfile, args.signer, args.portablePDB, args.embeddedPDB, args.embedAllSource, 
-                                  args.embedSourceList, args.sourceLink, args.emitTailcalls, args.deterministic, args.showTimes, args.dumpDebugInfo) modul normalizeAssemblyRefs
+                                  args.embedSourceList, args.sourceLink, args.emitTailcalls, args.deterministic, args.showTimes, args.dumpDebugInfo, args.pathMap) modul normalizeAssemblyRefs
     |> ignore

src/absil/ilwrite.fsi

@@ -3,6 +3,7 @@
 /// The IL Binary writer.
 module internal FSharp.Compiler.AbstractIL.ILBinaryWriter 
 
+open Internal.Utilities
 open FSharp.Compiler.AbstractIL 
 open FSharp.Compiler.AbstractIL.Internal 
 open FSharp.Compiler.AbstractIL.IL 
@@ -27,7 +28,8 @@ type options =
    emitTailcalls: bool
    deterministic: bool
    showTimes : bool
-   dumpDebugInfo : bool }
+   dumpDebugInfo : bool
+   pathMap : PathMap }
 
 /// Write a binary to the file system. Extra configuration parameters can also be specified. 
 val WriteILBinary: filename: string * options:  options * input: ILModuleDef * (ILAssemblyRef -> ILAssemblyRef) -> unit