From 2ac5b3132c775029572718c7d9ec55a753908d76 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Fri, 28 May 2021 14:21:16 -0700 Subject: [PATCH] Remove workaround for 16.10p2 now that 16.10 has shipped --- .../AbstractInProcLanguageClient.cs | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/AbstractInProcLanguageClient.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/AbstractInProcLanguageClient.cs index 118837d209ffd..181f16f555280 100644 --- a/src/VisualStudio/Core/Def/Implementation/LanguageClient/AbstractInProcLanguageClient.cs +++ b/src/VisualStudio/Core/Def/Implementation/LanguageClient/AbstractInProcLanguageClient.cs @@ -198,17 +198,7 @@ internal static async Task CreateAsync( var jsonRpc = new JsonRpc(new HeaderDelimitedMessageHandler(outputStream, inputStream, jsonMessageFormatter)); var serverTypeName = languageClient.GetType().Name; - LogHubLspLogger? logger = null; - // In 16.10 preview 2 LogHub moved to MS.VS.Utilities and MS.VS.RpcContracts and the old assembly was removed. - // To allow LSP integration tests to run on 16.10 preview 1, we only setup the loghub - // logger if the MS.VS.Utilities assembly contains the LogHub types. - // FeatureFlags.IFeatureFlags is a known type in the MS.VS.Utilities assembly. - // Removal tracked by https://github.com/dotnet/roslyn/issues/52454 - var traceConfigurationType = typeof(FeatureFlags.IFeatureFlags).Assembly.GetType("Microsoft.VisualStudio.LogHub.TraceConfiguration", throwOnError: false); - if (traceConfigurationType != null) - { - logger = await CreateLoggerAsync(asyncServiceProvider, serverTypeName, clientName, jsonRpc, cancellationToken).ConfigureAwait(false); - } + var logger = await CreateLoggerAsync(asyncServiceProvider, serverTypeName, clientName, jsonRpc, cancellationToken).ConfigureAwait(false); var server = languageClient.Create( jsonRpc, @@ -220,10 +210,6 @@ internal static async Task CreateAsync( return server; } - // Make sure this isn't inlined so these types are only loaded - // after the type check in CreateAsync. - // Removal tracked by https://github.com/dotnet/roslyn/issues/52454 - [MethodImpl(MethodImplOptions.NoInlining)] private static async Task CreateLoggerAsync( VSShell.IAsyncServiceProvider? asyncServiceProvider, string serverTypeName,