Merge remote-tracking branch 'upstream/master' into feature/constrained-runspace-support

Author: dkattan

CHANGELOG.md

@@ -1,5 +1,19 @@
 # PowerShell Editor Services Release History
 
+## v2.2.0-preview.3
+### Monday, June 01, 2020
+
+- 🚂✨ [PowerShellEditorServices #1301](https://github.com/PowerShell/PowerShellEditorServices/pull/1301) -
+  Fix `AddLanguageProtocolLogging` OmniSharp breaking change.
+- 🚨✨ [PowerShellEditorServices #1298](https://github.com/PowerShell/PowerShellEditorServices/pull/1298) -
+  Remove leftover csproj reference to already removed project in test project PowerShellEditorServices.Test.Host.csproj. (Thanks @bergmeister!)
+- 🚂✨ [PowerShellEditorServices #1300](https://github.com/PowerShell/PowerShellEditorServices/pull/1300) -
+  Address breaking changes in Omnisharp lib and depend on `DocumentUri` more.
+- 🚂✨ [PowerShellEditorServices #1291](https://github.com/PowerShell/PowerShellEditorServices/pull/1291) -
+  Depend on `DocumentUri` for handing vscode `Uri`'s.
+- 🧠✨ [vscode-powershell #2706](https://github.com/PowerShell/PowerShellEditorServices/pull/1294) -
+  Support `completionItem/resolve` request for comparison operators to show tooltip information.
+
 ## v2.2.0-preview.2
 ### Wednesday, May 13, 2020
 

PowerShellEditorServices.Common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>2.2.0</VersionPrefix>
-    <VersionSuffix>preview.2</VersionSuffix>
+    <VersionSuffix>preview.3</VersionSuffix>
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>PowerShell;editor;development;language;debugging</PackageTags>

src/PowerShellEditorServices/Server/PsesLanguageServer.cs

@@ -67,7 +67,7 @@ public async Task StartAsync()
                         .AddPsesLanguageServices(_hostDetails))
                     .ConfigureLogging(builder => builder
                         .AddSerilog(Log.Logger)
-                        .AddLanguageServer(_minimumLogLevel)
+                        .AddLanguageProtocolLogging(_minimumLogLevel)
                         .SetMinimumLevel(_minimumLogLevel))
                     .WithHandler<PsesWorkspaceSymbolsHandler>()
                     .WithHandler<PsesTextDocumentHandler>()