Merge dev16.1 to dev16.2

eng/Versions.props

@@ -25,7 +25,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <VSMajorVersion>16</VSMajorVersion>
-    <VSMinorVersion>0</VSMinorVersion>
+    <VSMinorVersion>1</VSMinorVersion>
     <VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
     <VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
     <VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -39,21 +39,6 @@
     <AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix).0</AssemblyVersion>
     <!-- PR builds should explicitly specify a version number -->
   </PropertyGroup>
-  <PropertyGroup>
-    <!--
-    The F# tools inserted into the RTM version of dev16 is 16.0.20190320.5, but due to a change in version number
-    computation, the current nightly package versions are 16.0.0.1920512 which won't allow for an upgrade.  To enable
-    this to work for nightly package upgrade we re-insert the build number (date) so that it's always increasing.  The
-    result is a nightly package version of 16.0.20190405.1920512 which satisfies the requirement of being larger than
-    the shipping version.
-    This change should not flow into dev16.1 as we've never published a package with a version number that looks like
-    16.1.<date>.x; they've all looked like 16.1.0.x.
-    -->
-    <_BuildNumber>$(OfficialBuildId)</_BuildNumber>
-    <_BuildNumber Condition="'$(OfficialBuildId)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd)).0</_BuildNumber>
-    <VsixVersionDateStampFix>$(_BuildNumber.Split('.')[0])</VsixVersionDateStampFix>
-    <VsixVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).$(VsixVersionDateStampFix)</VsixVersionPrefix>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- default package sources -->
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">

src/fsharp/NameResolution.fs

@@ -1586,7 +1586,7 @@ type TcResultsSinkImpl(g, ?sourceText: ISourceText) =
             // results in duplication of textual variables. So we ensure we never record two name resolutions
             // for the same identifier at the same location.
             if allowedRange m then
-                if replace then 
+                if replace then
                     capturedNameResolutions.RemoveAll(fun cnr -> Range.equals cnr.Range m) |> ignore
                     capturedMethodGroupResolutions.RemoveAll(fun cnr -> Range.equals cnr.Range m) |> ignore
                 else

src/fsharp/fsc.fs

@@ -148,8 +148,8 @@ type InProcErrorLoggerProvider() =
                             CollectDiagnostic
                                 (tcConfigBuilder.implicitIncludeDir, tcConfigBuilder.showFullPaths,
                                  tcConfigBuilder.flatErrors, tcConfigBuilder.errorStyle, isError, err, true)
-                        let container = if isError then errors else warnings 
-                        container.AddRange errs } 
+                        let container = if isError then errors else warnings
+                        container.AddRange(errs) }
                 :> ErrorLogger }
 
     member __.CapturedErrors = errors.ToArray()

src/fsharp/fsi/fsi.fsproj

@@ -30,6 +30,9 @@
     <ProjectReference Include="..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
     <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
 
+    <!-- only used when '$(TargetFramework)' == 'netstandard2.0' -->
+    <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+
     <!-- only used when '$(TargetFramework)' == 'net472' -->
     <ProjectReference Include="..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" Condition="'$(TargetFramework)' == 'net472'" />
   </ItemGroup>

src/utils/prim-lexing.fs

@@ -103,8 +103,8 @@ module SourceText =
 
 namespace Internal.Utilities.Text.Lexing
 
-    open Microsoft.FSharp.Core
     open FSharp.Compiler.Text
+    open Microsoft.FSharp.Core
     open Microsoft.FSharp.Collections
     open System.Collections.Generic
 

vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs

@@ -73,6 +73,33 @@ type internal FSharpCheckerWorkspaceServiceFactory
                 member this.Checker = checkerProvider.Checker
                 member this.FSharpProjectOptionsManager = projectInfoManager }
 
+[<Sealed>]
+type private FSharpSolutionEvents(projectManager: FSharpProjectOptionsManager) =
+
+    interface IVsSolutionEvents with
+
+        member __.OnAfterCloseSolution(_) =
+            projectManager.Checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients()
+            VSConstants.S_OK
+
+        member __.OnAfterLoadProject(_, _) = VSConstants.E_NOTIMPL
+
+        member __.OnAfterOpenProject(_, _) = VSConstants.E_NOTIMPL
+
+        member __.OnAfterOpenSolution(_, _) = VSConstants.E_NOTIMPL
+
+        member __.OnBeforeCloseProject(_, _) = VSConstants.E_NOTIMPL
+
+        member __.OnBeforeCloseSolution(_) = VSConstants.E_NOTIMPL
+
+        member __.OnBeforeUnloadProject(_, _) = VSConstants.E_NOTIMPL
+
+        member __.OnQueryCloseProject(_, _, _) = VSConstants.E_NOTIMPL
+
+        member __.OnQueryCloseSolution(_, _) = VSConstants.E_NOTIMPL
+
+        member __.OnQueryUnloadProject(_, _) = VSConstants.E_NOTIMPL       
+
 [<Microsoft.CodeAnalysis.Host.Mef.ExportWorkspaceServiceFactory(typeof<EditorOptions>, Microsoft.CodeAnalysis.Host.Mef.ServiceLayer.Default)>]
 type internal FSharpSettingsFactory
     [<Composition.ImportingConstructor>] (settings: EditorOptions) =
@@ -143,6 +170,8 @@ type internal FSharpPackage() as this =
             vfsiToolWindow <- this.FindToolWindow(typeof<Microsoft.VisualStudio.FSharp.Interactive.FsiToolWindow>, 0, true) :?> Microsoft.VisualStudio.FSharp.Interactive.FsiToolWindow
         vfsiToolWindow :> Microsoft.VisualStudio.FSharp.Interactive.ITestVFSI
 
+    let mutable solutionEventsOpt = None
+
     // FSI-LINKAGE-POINT: unsited init
     do 
         Microsoft.VisualStudio.FSharp.Interactive.Hooks.fsiConsoleWindowPackageCtorUnsited (this :> Package)
@@ -165,9 +194,13 @@ type internal FSharpPackage() as this =
                     let projectInfoManager = this.ComponentModel.DefaultExportProvider.GetExport<FSharpProjectOptionsManager>().Value
                     let solution = this.GetServiceAsync(typeof<SVsSolution>).Result
                     let solution = solution :?> IVsSolution
+                    let solutionEvents = FSharpSolutionEvents(projectInfoManager)
                     let rdt = this.GetServiceAsync(typeof<SVsRunningDocumentTable>).Result
                     let rdt = rdt :?> IVsRunningDocumentTable
 
+                    solutionEventsOpt <- Some(solutionEvents)
+                    solution.AdviseSolutionEvents(solutionEvents) |> ignore
+
                     let projectContextFactory = this.ComponentModel.GetService<IWorkspaceProjectContextFactory>()
                     let workspace = this.ComponentModel.GetService<VisualStudioWorkspace>()
                     let miscFilesWorkspace = this.ComponentModel.GetService<MiscellaneousFilesWorkspace>()

vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj

@@ -165,6 +165,8 @@
     <Compile Include="DocumentHighlightsServiceTests.fs">
       <Link>Roslyn\DocumentHighlightsServiceTests.fs</Link>
     </Compile>
+    <None Include="App.config" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="app.runsettings" />
     <None Include="App.config" />
     <None Include="app.runsettings">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>