From d70baed98dd9317c2cdeb903a122ff8d5700e65f Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 13 Jan 2020 11:12:27 -0800
Subject: [PATCH] Update our LanguageServer OmniSharp lib package version.

- Consuming several quality of life changes from O#. Such as support multiple languages in file paths.
- This also prepares us to take the TextDocumentSynchronization fixes started here: https://github.com/OmniSharp/csharp-language-server-protocol/pull/199
---
 eng/Versions.props                                         | 2 +-
 .../Microsoft.AspNetCore.Razor.LanguageServer/Program.cs   | 7 ++-----
 .../ProjectSystem/AddDocumentParams.cs                     | 2 +-
 .../ProjectSystem/RazorAddProjectParams.cs                 | 2 +-
 .../ProjectSystem/RazorRemoveProjectParams.cs              | 2 +-
 .../ProjectSystem/RazorUpdateProjectParams.cs              | 2 +-
 .../ProjectSystem/RemoveDocumentParams.cs                  | 2 +-
 .../RazorDocumentSynchronizationEndpoint.cs                | 2 +-
 .../RazorLanguageQueryParams.cs                            | 2 +-
 .../RazorMapToDocumentRangeParams.cs                       | 2 +-
 .../RazorProjectEndpoint.cs                                | 2 +-
 11 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d36754f3bcd..0be3e6f7467 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -121,7 +121,7 @@
     <MoqPackageVersion>4.10.0</MoqPackageVersion>
     <!-- STOP!!! We need to reference the version of JSON that our HOSTS supprt. -->
     <NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>
-    <OmniSharpExtensionsLanguageServerPackageVersion>0.13.1</OmniSharpExtensionsLanguageServerPackageVersion>
+    <OmniSharpExtensionsLanguageServerPackageVersion>0.14.1</OmniSharpExtensionsLanguageServerPackageVersion>
     <OmniSharpMSBuildPackageVersion>1.33.0</OmniSharpMSBuildPackageVersion>
     <VS_NewtonsoftJsonPackageVersion>12.0.2</VS_NewtonsoftJsonPackageVersion>
     <VSMAC_NewtonsoftJsonPackageVersion>12.0.2</VSMAC_NewtonsoftJsonPackageVersion>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs
index 6116ae6477a..081830b1620 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs
@@ -58,15 +58,12 @@ public static async Task MainAsync(string[] args)
 
             Serializer.Instance.JsonSerializer.Converters.RegisterRazorConverters();
 
-            var factory = new LoggerFactory();
             ILanguageServer server = null;
             server = await OmniSharp.Extensions.LanguageServer.Server.LanguageServer.From(options =>
                 options
                     .WithInput(Console.OpenStandardInput())
                     .WithOutput(Console.OpenStandardOutput())
-                    .WithLoggerFactory(factory)
-                    .AddDefaultLoggingProvider()
-                    .WithMinimumLogLevel(logLevel)
+                    .ConfigureLogging(builder => builder.SetMinimumLevel(logLevel))
                     .WithHandler<RazorDocumentSynchronizationEndpoint>()
                     .WithHandler<RazorCompletionEndpoint>()
                     .WithHandler<RazorHoverEndpoint>()
@@ -121,10 +118,10 @@ public static async Task MainAsync(string[] args)
 
             // Workaround for https://github.com/OmniSharp/csharp-language-server-protocol/issues/106
             var languageServer = (OmniSharp.Extensions.LanguageServer.Server.LanguageServer)server;
-            languageServer.MinimumLogLevel = logLevel;
 
             try
             {
+                var factory = new LoggerFactory();
                 var logger = factory.CreateLogger<Program>();
                 var assemblyInformationAttribute = typeof(Program).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
                 logger.LogInformation("Razor Language Server version " + assemblyInformationAttribute.InformationalVersion);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs
index 52e0032927c..7213608d87f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs
index 05ff80319e9..c00339142a4 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs
index ac61c62148c..51565eecdb7 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs
index 05dae1ff2eb..80315c3b9e4 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.LanguageServer.Common.Serialization;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs
index 16029343592..31a5150a9a0 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs
index 56396698b25..80709ddf331 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs
@@ -5,11 +5,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MediatR;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs
index 8bdb4c293c8..e992f1aa17f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorMapToDocumentRangeParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorMapToDocumentRangeParams.cs
index e6bf850948c..1e0e2eb22fc 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorMapToDocumentRangeParams.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorMapToDocumentRangeParams.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs
index 226b6100569..d6f3010421f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using MediatR;
 using Microsoft.AspNetCore.Razor.LanguageServer.Common.Serialization;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.Embedded.MediatR;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer
 {