Move liveshare client code to liveshare project.

Move liveshare client code from external access to liveshare project.

src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj

@@ -118,7 +118,7 @@
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.LiveShare" />
+    <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.LiveShare" />
     <InternalsVisibleTo Include="FSharp.Editor" Key="$(FSharpKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35076" />
     <InternalsVisibleTo Include="FSharp.LanguageService" Key="$(FSharpKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35076" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" LoadsWithinVisualStudio="false" />

src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Classification/RoslynClassificationService.Exports.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Classification
 {
     [ExportLanguageServiceFactory(typeof(IClassificationService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspClassificationServiceFactory : RoslynClassificationServiceFactory

src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.cs → src/VisualStudio/LiveShare/Impl/Client/Classification/RoslynClassificationService.cs

@@ -3,12 +3,13 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Classification;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Classification
 {
     /// <summary>
     /// Creates a classification service for a liveshare session.

src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationServiceFactory.cs → src/VisualStudio/LiveShare/Impl/Client/Classification/RoslynClassificationServiceFactory.cs

@@ -4,9 +4,8 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Classification
 {
-
     internal abstract class RoslynClassificationServiceFactory : ILanguageServiceFactory
     {
         protected abstract string LiveShareContentType { get; }

src/Tools/ExternalAccess/LiveShare/Classification/RoslynSyntaxClassificationService.cs → src/VisualStudio/LiveShare/Impl/Client/Classification/RoslynSyntaxClassificationService.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Classification;
 using Microsoft.CodeAnalysis.Classification.Classifiers;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -12,12 +13,11 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.LanguageServices.LiveShare;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
 using LS = Microsoft.VisualStudio.LiveShare.LanguageServices;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Classification
 {
     internal class RoslynSyntaxClassificationService : ISyntaxClassificationService
     {

src/Tools/ExternalAccess/LiveShare/Classification/RoslynSyntaxClassificationServiceFactory.cs → src/VisualStudio/LiveShare/Impl/Client/Classification/RoslynSyntaxClassificationServiceFactory.cs

@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Classification
 {
     internal abstract class RoslynSyntaxClassificationServiceFactory : ILanguageServiceFactory
     {

src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/CodeActions/RoslynCodeActionProvider.Exports.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.CodeActions
 {
     [Shared]
     [ExportCodeRefactoringProvider(StringConstants.CSharpLspLanguageName)]

src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.cs → src/VisualStudio/LiveShare/Impl/Client/CodeActions/RoslynCodeActionProvider.cs

@@ -10,7 +10,7 @@
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.CodeActions
 {
     internal class RoslynCodeActionProvider : CodeRefactoringProvider
     {

src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeAction.cs → src/VisualStudio/LiveShare/Impl/Client/CodeActions/RoslynRemoteCodeAction.cs

@@ -6,16 +6,17 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.LiveShare.LanguageServices;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.LanguageServer.CustomProtocol;
 using Microsoft.CodeAnalysis.LanguageServer;
-using Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
+using Microsoft.CodeAnalysis.LanguageServer.CustomProtocol;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
+using Microsoft.VisualStudio.LiveShare.LanguageServices;
 using Newtonsoft.Json.Linq;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.CodeActions
 {
     /// <summary>
     /// A codeaction that takes either a LSP command or a LSP codeaction.

src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeActionOperation.cs → src/VisualStudio/LiveShare/Impl/Client/CodeActions/RoslynRemoteCodeActionOperation.cs

@@ -2,13 +2,14 @@
 
 using System;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
 using Microsoft.VisualStudio.LiveShare.LanguageServices;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.CodeActions
 {
     internal class RoslynRemoteCodeActionOperation : CodeActionOperation
     {

src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Completion/RoslynCompletionProvider.Exports.cs

@@ -3,7 +3,7 @@
 using System.Composition;
 using Microsoft.CodeAnalysis.Completion;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Completion
 {
     [ExportCompletionProvider("CSharpLspCompletionProvider", StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspCompletionProvider : RoslynCompletionProvider

src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.cs → src/VisualStudio/LiveShare/Impl/Client/Completion/RoslynCompletionProvider.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.LanguageServer.CustomProtocol;
@@ -14,7 +15,7 @@
 using Newtonsoft.Json.Linq;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Completion
 {
     internal class RoslynCompletionProvider : CommonCompletionProvider
     {

src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Completion/RoslynCompletionService.Exports.cs

@@ -2,12 +2,12 @@
 
 using System;
 using System.Composition;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.VisualStudio.LanguageServices;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Completion
 {
     [ExportLanguageServiceFactory(typeof(CompletionService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspCompletionServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.cs → src/VisualStudio/LiveShare/Impl/Client/Completion/RoslynCompletionService.cs

@@ -2,11 +2,12 @@
 
 using System;
 using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Completion
 {
     internal class RoslynCompletionService : CompletionServiceWithProviders
     {

src/Tools/ExternalAccess/LiveShare/Debugging/CSharpLspContentTypeLanguageService.cs → src/VisualStudio/LiveShare/Impl/Client/Debugging/CSharpLspContentTypeLanguageService.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.VisualStudio.Utilities;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Debugging
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Debugging
 {
     [ExportContentTypeLanguageService(StringConstants.CSharpLspContentTypeName, StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspContentTypeLanguageService : IContentTypeLanguageService

src/Tools/ExternalAccess/LiveShare/Debugging/CSharpLspDebuggerIntelliSenseContext.cs → src/VisualStudio/LiveShare/Impl/Client/Debugging/CSharpLspDebuggerIntelliSenseContext.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -14,7 +15,7 @@
 using Microsoft.VisualStudio.Utilities;
 using TextSpan = Microsoft.VisualStudio.TextManager.Interop.TextSpan;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Debugging
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Debugging
 {
     /// <summary>
     /// CSharp's LSP Debugger Intellisense context

src/Tools/ExternalAccess/LiveShare/Debugging/CSharpLspLanguageService.cs → src/VisualStudio/LiveShare/Impl/Client/Debugging/CSharpLspLanguageService.cs

@@ -9,7 +9,7 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.TextManager.Interop;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Debugging
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Debugging
 {
     [Guid(StringConstants.CSharpLspLanguageServiceGuidString)]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2302:FlagServiceProviders")]
@@ -35,7 +35,7 @@ internal CSharpLspLanguageService(CSharpLspPackage package)
         protected override string RoslynLanguageName => StringConstants.CSharpLspLanguageName;
 
         public static CSharpLspLanguageService FromServiceProvider(IServiceProvider serviceProvider) =>
-            VisualStudio.LanguageServices.Implementation.Interop.ComAggregate.GetManagedObject<CSharpLspLanguageService>(serviceProvider.GetService(typeof(CSharpLspLanguageService)));
+            Implementation.Interop.ComAggregate.GetManagedObject<CSharpLspLanguageService>(serviceProvider.GetService(typeof(CSharpLspLanguageService)));
 
         protected override AbstractDebuggerIntelliSenseContext CreateContext(
             IWpfTextView view,

src/Tools/ExternalAccess/LiveShare/Debugging/CSharpLspPackage.cs → src/VisualStudio/LiveShare/Impl/Client/Debugging/CSharpLspPackage.cs

@@ -8,7 +8,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Debugging
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Debugging
 {
     [Guid(StringConstants.CSharpLspPackageGuidString)]
     [ProvideLanguageService(StringConstants.CSharpLspLanguageServiceGuidString, StringConstants.CSharpLspLanguageName, 101,

src/Tools/ExternalAccess/LiveShare/Debugging/VBLspContentTypeLanguageService.cs → src/VisualStudio/LiveShare/Impl/Client/Debugging/VBLspContentTypeLanguageService.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.VisualStudio.Utilities;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Debugging
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Debugging
 {
     [ExportContentTypeLanguageService(StringConstants.VBLspContentTypeName, StringConstants.VBLspLanguageName), Shared]
     internal class VBLspContentTypeLanguageService : IContentTypeLanguageService

src/Tools/ExternalAccess/LiveShare/Diagnostics/IRemoteDiagnosticsService.cs → src/VisualStudio/LiveShare/Impl/Client/Diagnostics/IRemoteDiagnosticsService.cs

@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Diagnostics
 {
     /// <summary>
     /// A service to get diagnostics for a given document from the remote machine.

src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynDocumentDiagnosticAnalyzer.cs → src/VisualStudio/LiveShare/Impl/Client/Diagnostics/RoslynDocumentDiagnosticAnalyzer.cs

@@ -3,9 +3,10 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Diagnostics
 {
     /// <summary>
     /// A diagnostic analyzer that fetches diagnostics from the remote side.

src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Diagnostics/RoslynRemoteDiagnosticsService.Exports.cs

@@ -3,7 +3,7 @@
 using System.Composition;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Diagnostics
 {
     [ExportLanguageService(typeof(IRemoteDiagnosticsService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspRemoteDiagnosticsService : RoslynRemoteDiagnosticsService

src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.cs → src/VisualStudio/LiveShare/Impl/Client/Diagnostics/RoslynRemoteDiagnosticsService.cs

@@ -4,6 +4,7 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
@@ -11,7 +12,7 @@
 using CustomMethods = Microsoft.VisualStudio.LiveShare.LanguageServices.Protocol.CustomMethods;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Diagnostics
 {
     internal class RoslynRemoteDiagnosticsService : IRemoteDiagnosticsService
     {

src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/GotoDefinition/RoslynGotoDefinitionService.Exports.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Composition;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.GotoDefinition
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.GotoDefinition
 {
 
     [ExportLanguageService(typeof(IGoToDefinitionService), StringConstants.CSharpLspLanguageName), Shared]

src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.cs → src/VisualStudio/LiveShare/Impl/Client/GotoDefinition/RoslynGotoDefinitionService.cs

@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -17,7 +18,7 @@
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 using TPL = System.Threading.Tasks;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.GotoDefinition
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.GotoDefinition
 {
     internal class RoslynGotoDefinitionService : IGoToDefinitionService
     {
@@ -95,7 +96,7 @@ private async TPL.Task<ImmutableArray<DefinitionItem>> GetDefinitionItemsAsync(D
             }
 
             var definitionItems = ImmutableArray.CreateBuilder<DefinitionItem>();
-            foreach (LSP.Location location in locations)
+            foreach (var location in locations)
             {
                 DocumentSpan? documentSpan;
                 if (lspClient.ProtocolConverter.IsExternalDocument(location.Uri))

src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Highlights/RoslynDocumentHighlightsService.Exports.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.DocumentHighlighting;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Highlights
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Highlights
 {
     [ExportLanguageService(typeof(IDocumentHighlightsService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspDocumentHighlightsService : RoslynDocumentHighlightsService

src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.cs → src/VisualStudio/LiveShare/Impl/Client/Highlights/RoslynDocumentHighlightsService.cs

@@ -5,12 +5,13 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.DocumentHighlighting;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Highlights
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Highlights
 {
     internal class RoslynDocumentHighlightsService : IDocumentHighlightsService
     {

src/Tools/ExternalAccess/LiveShare/HostLanguageServicesExtensions.cs → src/VisualStudio/LiveShare/Impl/Client/HostLanguageServicesExtensions.cs

@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     internal static class HostLanguageServicesExtensions
     {

src/Tools/ExternalAccess/LiveShare/LanguageServiceUtils.cs → src/VisualStudio/LiveShare/Impl/Client/LanguageServiceUtils.cs

@@ -5,7 +5,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     internal static class LanguageServicesUtils
     {

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteBlockStructureService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteBlockStructureService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Structure;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(BlockStructureService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspBlockStructureServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteBraceCompletionService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteBraceCompletionService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IEditorBraceCompletionSessionFactory), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspBraceCompletionServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteDocumentDifferenceService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteDocumentDifferenceService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.SolutionCrawler;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IDocumentDifferenceService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspDocumentDifferenceServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteLineSeparatorService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteLineSeparatorService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ILineSeparatorService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspLineSeparatorServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteRenameTrackingLanguageHeuristicsService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteRenameTrackingLanguageHeuristicsService.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.RenameTracking;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageService(typeof(IRenameTrackingLanguageHeuristicsService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspRenameTrackingLanguageHeuristicsService : IRenameTrackingLanguageHeuristicsService

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteSyntaxFactsService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteSyntaxFactsService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServices;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISyntaxFactsService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspSyntaxFactsServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/CSharpRemoteSyntaxTreeFactoryService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/CSharpRemoteSyntaxTreeFactoryService.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISyntaxTreeFactoryService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspSyntaxTreeFactoryServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Comments/CSharpRemoteCommentSelectionService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Comments/CSharpRemoteCommentSelectionService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.CommentSelection;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ICommentSelectionService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspCommentSelectionServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Comments/CSharpRemoteDocumentationCommentFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Comments/CSharpRemoteDocumentationCommentFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.DocumentationComments;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IDocumentationCommentFormattingService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspDocumentationCommentFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Comments/VBRemoteCommentSelectionService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Comments/VBRemoteCommentSelectionService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.CommentSelection;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ICommentSelectionService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspCommentSelectionServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Comments/VBRemoteDocumentationCommentFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Comments/VBRemoteDocumentationCommentFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.DocumentationComments;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IDocumentationCommentFormattingService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspDocumentationCommentFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Debugging/CSharpRemoteBreakpointService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Debugging/CSharpRemoteBreakpointService.cs

@@ -5,12 +5,13 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.Implementation.Debugging;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IBreakpointResolutionService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspBreakpointServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Debugging/CSharpRemoteDebugInfoService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Debugging/CSharpRemoteDebugInfoService.cs

@@ -4,13 +4,14 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Debugging;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ILanguageDebugInfoService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspDebugInfoServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Debugging/VBRemoteBreakpointService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Debugging/VBRemoteBreakpointService.cs

-//
+//
 //  Copyright (c) Microsoft Corporation. All rights reserved.
 //
 using System;
@@ -13,7 +13,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IBreakpointResolutionService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspBreakpointServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Debugging/VBRemoteDebugInfoService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Debugging/VBRemoteDebugInfoService.cs

@@ -4,13 +4,14 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Debugging;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ILanguageDebugInfoService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspDebugInfoServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/CSharpRemoteEditorFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/CSharpRemoteEditorFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IEditorFormattingService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspEditorFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/CSharpRemoteFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/CSharpRemoteFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IFormattingService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/CSharpRemoteIndentationService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/CSharpRemoteIndentationService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Indentation;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IIndentationService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspIndentationServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/CSharpRemoteSyntaxFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/CSharpRemoteSyntaxFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISyntaxFormattingService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspSyntaxFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/VBRemoteEditorFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/VBRemoteEditorFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IEditorFormattingService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspEditorFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/VBRemoteFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/VBRemoteFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IFormattingService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/VBRemoteIndentationService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/VBRemoteIndentationService.cs

@@ -6,7 +6,7 @@
 using System.Composition;
 using System;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISynchronousIndentationService), StringConstants.VBLspLanguageName), Shared]
     [Obsolete]

src/Tools/ExternalAccess/LiveShare/LocalForwarders/Formatting/VBRemoteSyntaxFormattingService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/Formatting/VBRemoteSyntaxFormattingService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISyntaxFormattingService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspSyntaxFormattingServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteBlockStructureService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteBlockStructureService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Structure;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(BlockStructureService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspBlockStructureServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteBraceCompletionService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteBraceCompletionService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IEditorBraceCompletionSessionFactory), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspBraceCompletionServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteDocumentDifferenceService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteDocumentDifferenceService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.SolutionCrawler;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(IDocumentDifferenceService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspDocumentDifferenceServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteLineSeparatorService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteLineSeparatorService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ILineSeparatorService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspLineSeparatorServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteRenameTrackingLanguageHeuristicsService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteRenameTrackingLanguageHeuristicsService.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.RenameTracking;
 using System.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageService(typeof(IRenameTrackingLanguageHeuristicsService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspRenameTrackingLanguageHeuristicsService : IRenameTrackingLanguageHeuristicsService

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteSyntaxFactsService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteSyntaxFactsService.cs

@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServices;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISyntaxFactsService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspSyntaxFactsServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/LocalForwarders/VBRemoteSyntaxTreeFactoryService.cs → src/VisualStudio/LiveShare/Impl/Client/LocalForwarders/VBRemoteSyntaxTreeFactoryService.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.LocalForwarders
 {
     [ExportLanguageServiceFactory(typeof(ISyntaxTreeFactoryService), StringConstants.VBLspLanguageName), Shared]
     internal class VBLspSyntaxTreeFactoryServiceFactory : ILanguageServiceFactory

src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Navigation/RoslynNavigationBarItemService.Exports.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Composition;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Navigation
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Navigation
 {
     [ExportLanguageService(typeof(INavigationBarItemService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspNavigationBarItemService : RoslynNavigationBarItemService

src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.cs → src/VisualStudio/LiveShare/Impl/Client/Navigation/RoslynNavigationBarItemService.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Extensibility.NavigationBar;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -17,7 +18,7 @@
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
 using Microsoft.VisualStudio.Text.Editor;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Navigation
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Navigation
 {
     internal class RoslynNavigationBarItemService : AbstractNavigationBarItemService
     {

src/Tools/ExternalAccess/LiveShare/Projects/FileTextLoaderNoException.cs → src/VisualStudio/LiveShare/Impl/Client/Projects/FileTextLoaderNoException.cs

@@ -4,9 +4,10 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects
 {
     /// <summary>
     /// This is a FileTextLoader which no-ops if the file is not available on disk. This is the common case for
@@ -18,7 +19,7 @@ public FileTextLoaderNoException(string path, Encoding defaultEncoding) : base(p
         {
         }
 
-        public override Task<TextAndVersion> LoadTextAndVersionAsync(CodeAnalysis.Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
+        public override Task<TextAndVersion> LoadTextAndVersionAsync(Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
         {
             if (!File.Exists(Path))
             {

src/Tools/ExternalAccess/LiveShare/Projects/IRemoteProjectInfoProvider.cs → src/VisualStudio/LiveShare/Impl/Client/Projects/IRemoteProjectInfoProvider.cs

@@ -3,8 +3,9 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects
 {
     interface IRemoteProjectInfoProvider
     {

src/Tools/ExternalAccess/LiveShare/Projects/RemoteProjectInfoProvider.cs → src/VisualStudio/LiveShare/Impl/Client/Projects/RemoteProjectInfoProvider.cs

@@ -8,8 +8,9 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects
 {
     /// <summary>
     /// Discovers project information for remote directories

src/Tools/ExternalAccess/LiveShare/Projects/RoslynRemoteProjectInfoProvider.cs → src/VisualStudio/LiveShare/Impl/Client/Projects/RoslynRemoteProjectInfoProvider.cs

@@ -7,11 +7,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.LiveShare.LanguageServices;
-using CustomProtocol = Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
-using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects
 {
     [Export(typeof(IRemoteProjectInfoProvider))]
     internal class RoslynRemoteProjectInfoProvider : IRemoteProjectInfoProvider

src/Tools/ExternalAccess/LiveShare/Razor/CSharpLspContainedLanguageProvider.cs → src/VisualStudio/LiveShare/Impl/Client/Razor/CSharpLspContainedLanguageProvider.cs

@@ -2,16 +2,16 @@
 
 using System;
 using System.ComponentModel.Composition;
-using Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Debugging;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Venus;
+using Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Debugging;
 using Microsoft.VisualStudio.LiveShare.WebEditors.ContainedLanguage;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Razor
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Razor
 {
     [Export(typeof(IContainedLanguageProvider))]
     internal class CSharpLspContainedLanguageProvider : IContainedLanguageProvider

src/Tools/ExternalAccess/LiveShare/Razor/CSharpRazorProject.cs → src/VisualStudio/LiveShare/Impl/Client/Razor/CSharpRazorProject.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
+using System.ComponentModel.Composition;
+using System.Linq;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
 using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList;
-using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TextManager.Interop;
-using System.Linq;
-using System;
-using System.ComponentModel.Composition;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Razor
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Razor
 {
     [Export]
     internal class CSharpLspRazorProject

src/Tools/ExternalAccess/LiveShare/Razor/RazorProjectHierarchy.cs → src/VisualStudio/LiveShare/Impl/Client/Razor/RazorProjectHierarchy.cs

@@ -4,7 +4,7 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Razor
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Razor
 {
     class RazorProjectHierarchy : IVsHierarchy, IVsProject
     {

src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.Exports..cs → src/VisualStudio/LiveShare/Impl/Client/References/RoslynFindUsagesService.Exports..cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.References
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.References
 {
     [ExportLanguageService(typeof(IFindUsagesService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspFindUsagesService : RoslynFindUsagesService

src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.cs → src/VisualStudio/LiveShare/Impl/Client/References/RoslynFindUsagesService.cs

@@ -3,15 +3,15 @@
 using System;
 using System.Collections.Immutable;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
-using Microsoft.VisualStudio.LiveShare.LanguageServices;
 using Newtonsoft.Json.Linq;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.References
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.References
 {
     internal class RoslynFindUsagesService : IFindUsagesService
     {

src/Tools/ExternalAccess/LiveShare/RemoteDiagnosticListTable.cs → src/VisualStudio/LiveShare/Impl/Client/RemoteDiagnosticListTable.cs

@@ -8,7 +8,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.TableManager;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     /// <summary>
     /// An error list provider that gets diagnostics from the Roslyn diagnostics service.

src/Tools/ExternalAccess/LiveShare/RemoteLanguageServiceWorkspace.cs → src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs

@@ -11,15 +11,13 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-using Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Composition;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.LanguageServices;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
+using Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects;
 using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
@@ -28,7 +26,7 @@
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     /// <summary>
     /// A Roslyn workspace that contains projects that exist on a remote machine.

src/Tools/ExternalAccess/LiveShare/RemoteLanguageServiceWorkspaceHost.cs → src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspaceHost.cs

@@ -6,19 +6,20 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-using Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Options;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
+using Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects;
 using Microsoft.VisualStudio.LanguageServices.Setup;
 using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     /// <summary>
     /// Remote language service workspace host

src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/Rename/RoslynRenameService.Exports.cs

@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Rename
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Rename
 {
     [ExportLanguageService(typeof(IEditorInlineRenameService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspRenameService : RoslynRenameService

src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.FailureRenameInfo.cs → src/VisualStudio/LiveShare/Impl/Client/Rename/RoslynRenameService.FailureRenameInfo.cs

@@ -3,11 +3,12 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Rename
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Rename
 {
     internal partial class RoslynRenameService
     {

src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.cs → src/VisualStudio/LiveShare/Impl/Client/Rename/RoslynRenameService.cs

@@ -2,9 +2,10 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Rename
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Rename
 {
     internal partial class RoslynRenameService : IEditorInlineRenameService
     {

src/Tools/ExternalAccess/LiveShare/RoslynLSPClientService.cs → src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs

@@ -12,7 +12,7 @@
 using Task = System.Threading.Tasks.Task;
 using LS = Microsoft.VisualStudio.LiveShare.LanguageServices;
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     internal abstract class AbstractLspClientServiceFactory : ICollaborationServiceFactory
     {

src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.Exports.cs → src/VisualStudio/LiveShare/Impl/Client/SignatureHelp/RoslynSignatureHelpProvider.Exports.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Composition;
-using Microsoft.CodeAnalysis.ExternalAccess.LiveShare;
 using Microsoft.CodeAnalysis.SignatureHelp;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.SignatureHelp
 {
     [Shared]
     [ExportSignatureHelpProvider("CSharpLspSignatureHelpProvider", StringConstants.CSharpLspLanguageName)]

src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.cs → src/VisualStudio/LiveShare/Impl/Client/SignatureHelp/RoslynSignatureHelpProvider.cs

@@ -7,13 +7,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.ExternalAccess.LiveShare;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.SignatureHelp;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.SignatureHelp
 {
     class RoslynSignatureHelpProvider : ISignatureHelpProvider
     {
@@ -50,7 +49,7 @@ public async Task<SignatureHelpItems> GetItemsAsync(Document document, int posit
             var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
             var textDocumentPositionParams = ProtocolConversions.PositionToTextDocumentPositionParams(position, text, document);
 
-            SignatureHelp signatureHelp = await lspClient.RequestAsync(Methods.TextDocumentSignatureHelp.ToLSRequest(), textDocumentPositionParams, cancellationToken).ConfigureAwait(false);
+            var signatureHelp = await lspClient.RequestAsync(Methods.TextDocumentSignatureHelp.ToLSRequest(), textDocumentPositionParams, cancellationToken).ConfigureAwait(false);
             if (signatureHelp == null || signatureHelp.Signatures == null || signatureHelp.Signatures.Length <= 0)
             {
                 return null;

src/Tools/ExternalAccess/LiveShare/StringConstants.cs → src/VisualStudio/LiveShare/Impl/Client/StringConstants.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
+namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
 {
     internal class StringConstants
     {

src/VisualStudio/LiveShare/Impl/Microsoft.VisualStudio.LanguageServices.LiveShare.csproj

@@ -10,20 +10,28 @@
     <PackageDescription>
       A private package for the liveshare team to grant access to LSP implementations.
     </PackageDescription>
+    <CreateVsixContainer>false</CreateVsixContainer>
+    <GeneratePkgDefFile>true</GeneratePkgDefFile>
   </PropertyGroup>
+  
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Features\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
   </ItemGroup>
+  
   <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Imaging" Version="$(MicrosoftVisualStudioImagingVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.LiveShare.LanguageServices.Guest" Version="$(MicrosoftVisualStudioLiveShareLanguageServicesGuestVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.LiveShare.WebEditors" Version="$(MicrosoftVisualStudioLiveShareWebEditorsVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="$(MicrosoftVisualStudioShellFrameworkVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
     <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
   </ItemGroup>
+  
   <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.LiveShare" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests" />
   </ItemGroup>
 </Project>
\ No newline at end of file