Fix merge

src/EditorFeatures/Core/FindUsages/IFindSymbolMonikerUsagesService.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
@@ -43,6 +44,7 @@ public virtual IAsyncEnumerable<ExternalReferenceItem> FindReferencesByMoniker(D
     internal class DefaultFindSymbolMonikerUsagesService : AbstractFindSymbolMonikerUsagesService
     {
         [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public DefaultFindSymbolMonikerUsagesService()
         {
         }

src/VisualStudio/Core/Def/Implementation/FindUsages/VisualStudioFindSymbolMonikerUsagesService.cs

@@ -35,6 +35,7 @@ internal partial class VisualStudioFindSymbolMonikerUsagesService : AbstractFind
         private CancellationTokenSource? _lastNavigationCancellationSource;
 
         [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public VisualStudioFindSymbolMonikerUsagesService(
             [Import(AllowDefault = true)] ICodeIndexProvider? codeIndexProvider)
         {

src/VisualStudio/LiveShare/Impl/Shims/CodeActionsHandlerShim.cs

@@ -20,11 +20,12 @@
 
 namespace Microsoft.VisualStudio.LanguageServices.LiveShare
 {
-    internal class CodeActionsHandlerShim : CodeActionsHandler, ILspRequestHandler<CodeActionParams, SumType<Command, CodeAction>[], Solution>
+    internal abstract class CodeActionsHandlerShim : CodeActionsHandler, ILspRequestHandler<CodeActionParams, SumType<Command, CodeAction>[], Solution>
     {
         public const string RemoteCommandNamePrefix = "_liveshare.remotecommand";
         protected const string ProviderName = "Roslyn";
 
+        [Obsolete(MefConstruction.ImportingConstructorMessage, true)]
         public CodeActionsHandlerShim(ICodeFixService codeFixService, ICodeRefactoringService codeRefactoringService) : base(codeFixService, codeRefactoringService)
         {
         }