ExternalAccess layering (#73887)

* ExternalAccess layering * Style fixes
dotnet · Jun 7, 2024 · e867be9 · e867be9
1 parent f0a5241
commit e867be9
Show file tree

Hide file tree

Showing 296 changed files with 80 additions and 111 deletions.
diff --git a/Roslyn.sln b/Roslyn.sln
diff --git a/...opilot/Analyzer/CopilotChecksumWrapper.cs → ...opilot/Analyzer/CopilotChecksumWrapper.cs b/...opilot/Analyzer/CopilotChecksumWrapper.cs → ...opilot/Analyzer/CopilotChecksumWrapper.cs
diff --git a/...cess/Copilot/Analyzer/CopilotUtilities.cs → ...cess/Copilot/Analyzer/CopilotUtilities.cs b/...cess/Copilot/Analyzer/CopilotUtilities.cs → ...cess/Copilot/Analyzer/CopilotUtilities.cs
diff --git a/...ternalCSharpCopilotCodeAnalysisService.cs → ...ternalCSharpCopilotCodeAnalysisService.cs b/...ternalCSharpCopilotCodeAnalysisService.cs → ...ternalCSharpCopilotCodeAnalysisService.cs
diff --git a/...odeMapper/ICSharpCopilotMapCodeService.cs → ...odeMapper/ICSharpCopilotMapCodeService.cs b/...odeMapper/ICSharpCopilotMapCodeService.cs → ...odeMapper/ICSharpCopilotMapCodeService.cs
diff --git a/...zer/AbstractCopilotCodeAnalysisService.cs → ...zer/AbstractCopilotCodeAnalysisService.cs b/...zer/AbstractCopilotCodeAnalysisService.cs → ...zer/AbstractCopilotCodeAnalysisService.cs
@@ -55,7 +55,7 @@ public async Task<ImmutableArray<string>> GetAvailablePromptTitlesAsync(Document
         return await GetAvailablePromptTitlesCoreAsync(document, cancellationToken).ConfigureAwait(false);
     }
 
-    private async Task<bool> ShouldSkipAnalysisAsync(Document document, CancellationToken cancellationToken)
+    private static async Task<bool> ShouldSkipAnalysisAsync(Document document, CancellationToken cancellationToken)
     {
         if (document.GetLanguageService<ICopilotOptionsService>() is not { } service)
             return true;

diff --git a/...tCodeAnalysisService.ReflectionWrapper.cs → ...tCodeAnalysisService.ReflectionWrapper.cs b/...tCodeAnalysisService.ReflectionWrapper.cs → ...tCodeAnalysisService.ReflectionWrapper.cs
diff --git a/...Sharp/CSharpCopilotCodeAnalysisService.cs → ...Sharp/CSharpCopilotCodeAnalysisService.cs b/...Sharp/CSharpCopilotCodeAnalysisService.cs → ...Sharp/CSharpCopilotCodeAnalysisService.cs
diff --git a/...CodeMapper/CopilotCSharpMapCodeService.cs → ...CodeMapper/CopilotCSharpMapCodeService.cs b/...CodeMapper/CopilotCSharpMapCodeService.cs → ...CodeMapper/CopilotCSharpMapCodeService.cs
diff --git a/...ternalAccess/Apex/InternalAPI.Shipped.txt → ...nalAccess/Copilot/InternalAPI.Shipped.txt b/...ternalAccess/Apex/InternalAPI.Shipped.txt → ...nalAccess/Copilot/InternalAPI.Shipped.txt
diff --git a/...lAccess/Copilot/InternalAPI.Unshipped.txt → ...lAccess/Copilot/InternalAPI.Unshipped.txt b/...lAccess/Copilot/InternalAPI.Unshipped.txt → ...lAccess/Copilot/InternalAPI.Unshipped.txt
diff --git a/...odeAnalysis.ExternalAccess.Copilot.csproj → ...odeAnalysis.ExternalAccess.Copilot.csproj b/...odeAnalysis.ExternalAccess.Copilot.csproj → ...odeAnalysis.ExternalAccess.Copilot.csproj
@@ -24,8 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ExternalAccess/Apex/PublicAPI.Shipped.txt → ...ernalAccess/Copilot/PublicAPI.Shipped.txt b/...ExternalAccess/Apex/PublicAPI.Shipped.txt → ...ernalAccess/Copilot/PublicAPI.Shipped.txt
diff --git a/...ternalAccess/Apex/PublicAPI.Unshipped.txt → ...nalAccess/Copilot/PublicAPI.Unshipped.txt b/...ternalAccess/Apex/PublicAPI.Unshipped.txt → ...nalAccess/Copilot/PublicAPI.Unshipped.txt
diff --git a/...Debugger/DebuggerFindReferencesService.cs → ...Debugger/DebuggerFindReferencesService.cs b/...Debugger/DebuggerFindReferencesService.cs → ...Debugger/DebuggerFindReferencesService.cs
diff --git a/...ss/Debugger/GlassTestsHotReloadService.cs → ...ss/Debugger/GlassTestsHotReloadService.cs b/...ss/Debugger/GlassTestsHotReloadService.cs → ...ss/Debugger/GlassTestsHotReloadService.cs
diff --git a/...Access/AspNetCore/InternalAPI.Shipped.txt → ...alAccess/Debugger/InternalAPI.Shipped.txt b/...Access/AspNetCore/InternalAPI.Shipped.txt → ...alAccess/Debugger/InternalAPI.Shipped.txt
diff --git a/...Access/Debugger/InternalAPI.Unshipped.txt → ...Access/Debugger/InternalAPI.Unshipped.txt b/...Access/Debugger/InternalAPI.Unshipped.txt → ...Access/Debugger/InternalAPI.Unshipped.txt
diff --git a/...deAnalysis.ExternalAccess.Debugger.csproj → ...deAnalysis.ExternalAccess.Debugger.csproj b/...deAnalysis.ExternalAccess.Debugger.csproj → ...deAnalysis.ExternalAccess.Debugger.csproj
@@ -28,10 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...alAccess/AspNetCore/PublicAPI.Shipped.txt → ...rnalAccess/Debugger/PublicAPI.Shipped.txt b/...alAccess/AspNetCore/PublicAPI.Shipped.txt → ...rnalAccess/Debugger/PublicAPI.Shipped.txt
diff --git a/...Access/AspNetCore/PublicAPI.Unshipped.txt → ...alAccess/Debugger/PublicAPI.Unshipped.txt b/...Access/AspNetCore/PublicAPI.Unshipped.txt → ...alAccess/Debugger/PublicAPI.Unshipped.txt
diff --git a/...Package/AspNetCoreAddPackageCodeAction.cs → ...Package/AspNetCoreAddPackageCodeAction.cs b/...Package/AspNetCoreAddPackageCodeAction.cs → ...Package/AspNetCoreAddPackageCodeAction.cs
diff --git a/...es/AspNetCoreCSharpRouteSyntaxDetector.cs → ...es/AspNetCoreCSharpRouteSyntaxDetector.cs b/...es/AspNetCoreCSharpRouteSyntaxDetector.cs → ...es/AspNetCoreCSharpRouteSyntaxDetector.cs
@@ -30,7 +30,7 @@ private AspNetCoreCSharpRouteSyntaxDetector()
     {
     }
 
-    public bool IsEmbeddedLanguageToken(
+    public static bool IsEmbeddedLanguageToken(
         SyntaxToken token,
         SemanticModel semanticModel,
         CancellationToken cancellationToken,

diff --git a/...ges/AspNetCoreCSharpVirtualCharService.cs → ...ges/AspNetCoreCSharpVirtualCharService.cs b/...ges/AspNetCoreCSharpVirtualCharService.cs → ...ges/AspNetCoreCSharpVirtualCharService.cs
diff --git a/...mbeddedLanguages/AspNetCoreVirtualChar.cs → ...mbeddedLanguages/AspNetCoreVirtualChar.cs b/...mbeddedLanguages/AspNetCoreVirtualChar.cs → ...mbeddedLanguages/AspNetCoreVirtualChar.cs
diff --git a/...anguages/AspNetCoreVirtualCharSequence.cs → ...anguages/AspNetCoreVirtualCharSequence.cs b/...anguages/AspNetCoreVirtualCharSequence.cs → ...anguages/AspNetCoreVirtualCharSequence.cs
diff --git a/...spNetCoreBraceMatcherExtensionProvider.cs → ...spNetCoreBraceMatcherExtensionProvider.cs b/...spNetCoreBraceMatcherExtensionProvider.cs → ...spNetCoreBraceMatcherExtensionProvider.cs
diff --git a/...Matching/AspNetCoreBraceMatchingResult.cs → ...Matching/AspNetCoreBraceMatchingResult.cs b/...Matching/AspNetCoreBraceMatchingResult.cs → ...Matching/AspNetCoreBraceMatchingResult.cs
diff --git a/...eEmbeddedLanguageBraceMatcherAttribute.cs → ...eEmbeddedLanguageBraceMatcherAttribute.cs b/...eEmbeddedLanguageBraceMatcherAttribute.cs → ...eEmbeddedLanguageBraceMatcherAttribute.cs
diff --git a/...AspNetCoreEmbeddedLanguageBraceMatcher.cs → ...AspNetCoreEmbeddedLanguageBraceMatcher.cs b/...AspNetCoreEmbeddedLanguageBraceMatcher.cs → ...AspNetCoreEmbeddedLanguageBraceMatcher.cs
diff --git a/.../AspNetCoreClassifierExtensionProvider.cs → .../AspNetCoreClassifierExtensionProvider.cs b/.../AspNetCoreClassifierExtensionProvider.cs → .../AspNetCoreClassifierExtensionProvider.cs
diff --git a/...eEmbeddedLanguageClassificationContext.cs → ...eEmbeddedLanguageClassificationContext.cs b/...eEmbeddedLanguageClassificationContext.cs → ...eEmbeddedLanguageClassificationContext.cs
diff --git a/...oreEmbeddedLanguageClassifierAttribute.cs → ...oreEmbeddedLanguageClassifierAttribute.cs b/...oreEmbeddedLanguageClassifierAttribute.cs → ...oreEmbeddedLanguageClassifierAttribute.cs
diff --git a/.../IAspNetCoreEmbeddedLanguageClassifier.cs → .../IAspNetCoreEmbeddedLanguageClassifier.cs b/.../IAspNetCoreEmbeddedLanguageClassifier.cs → .../IAspNetCoreEmbeddedLanguageClassifier.cs
diff --git a/.../AspNetCoreClassifierExtensionProvider.cs → .../AspNetCoreClassifierExtensionProvider.cs b/.../AspNetCoreClassifierExtensionProvider.cs → .../AspNetCoreClassifierExtensionProvider.cs
diff --git a/...oreEmbeddedLanguageClassifierAttribute.cs → ...oreEmbeddedLanguageClassifierAttribute.cs b/...oreEmbeddedLanguageClassifierAttribute.cs → ...oreEmbeddedLanguageClassifierAttribute.cs
diff --git a/...g/IEmbeddedLanguageDocumentHighlighter.cs → ...g/IEmbeddedLanguageDocumentHighlighter.cs b/...g/IEmbeddedLanguageDocumentHighlighter.cs → ...g/IEmbeddedLanguageDocumentHighlighter.cs
diff --git a/...re/ExternalAccessAspNetCoreResources.resx → ...re/ExternalAccessAspNetCoreResources.resx b/...re/ExternalAccessAspNetCoreResources.resx → ...re/ExternalAccessAspNetCoreResources.resx
diff --git a/...AspNetCoreEmbeddedLanguageBraceMatcher.cs → ...AspNetCoreEmbeddedLanguageBraceMatcher.cs b/...AspNetCoreEmbeddedLanguageBraceMatcher.cs → ...AspNetCoreEmbeddedLanguageBraceMatcher.cs
diff --git a/...s/AspNetCoreEmbeddedLanguageClassifier.cs → ...s/AspNetCoreEmbeddedLanguageClassifier.cs b/...s/AspNetCoreEmbeddedLanguageClassifier.cs → ...s/AspNetCoreEmbeddedLanguageClassifier.cs
diff --git a/...oreEmbeddedLanguageDocumentHighlighter.cs → ...oreEmbeddedLanguageDocumentHighlighter.cs b/...oreEmbeddedLanguageDocumentHighlighter.cs → ...oreEmbeddedLanguageDocumentHighlighter.cs
diff --git a/...pilerDeveloperSDK/InternalAPI.Shipped.txt → ...Access/AspNetCore/InternalAPI.Shipped.txt b/...pilerDeveloperSDK/InternalAPI.Shipped.txt → ...Access/AspNetCore/InternalAPI.Shipped.txt
diff --git a/...cess/AspNetCore/InternalAPI.Unshipped.txt → ...cess/AspNetCore/InternalAPI.Unshipped.txt b/...cess/AspNetCore/InternalAPI.Unshipped.txt → ...cess/AspNetCore/InternalAPI.Unshipped.txt
diff --git a/...Analysis.ExternalAccess.AspNetCore.csproj → ...Analysis.ExternalAccess.AspNetCore.csproj b/...Analysis.ExternalAccess.AspNetCore.csproj → ...Analysis.ExternalAccess.AspNetCore.csproj
@@ -30,9 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ompilerDeveloperSDK/PublicAPI.Shipped.txt → ...alAccess/AspNetCore/PublicAPI.Shipped.txt b/...ompilerDeveloperSDK/PublicAPI.Shipped.txt → ...alAccess/AspNetCore/PublicAPI.Shipped.txt
diff --git a/...pilerDeveloperSDK/PublicAPI.Unshipped.txt → ...Access/AspNetCore/PublicAPI.Unshipped.txt b/...pilerDeveloperSDK/PublicAPI.Unshipped.txt → ...Access/AspNetCore/PublicAPI.Unshipped.txt
diff --git a/.../ExternalAccessAspNetCoreResources.cs.xlf → .../ExternalAccessAspNetCoreResources.cs.xlf b/.../ExternalAccessAspNetCoreResources.cs.xlf → .../ExternalAccessAspNetCoreResources.cs.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.de.xlf → .../ExternalAccessAspNetCoreResources.de.xlf b/.../ExternalAccessAspNetCoreResources.de.xlf → .../ExternalAccessAspNetCoreResources.de.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.es.xlf → .../ExternalAccessAspNetCoreResources.es.xlf b/.../ExternalAccessAspNetCoreResources.es.xlf → .../ExternalAccessAspNetCoreResources.es.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.fr.xlf → .../ExternalAccessAspNetCoreResources.fr.xlf b/.../ExternalAccessAspNetCoreResources.fr.xlf → .../ExternalAccessAspNetCoreResources.fr.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.it.xlf → .../ExternalAccessAspNetCoreResources.it.xlf b/.../ExternalAccessAspNetCoreResources.it.xlf → .../ExternalAccessAspNetCoreResources.it.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.ja.xlf → .../ExternalAccessAspNetCoreResources.ja.xlf b/.../ExternalAccessAspNetCoreResources.ja.xlf → .../ExternalAccessAspNetCoreResources.ja.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.ko.xlf → .../ExternalAccessAspNetCoreResources.ko.xlf b/.../ExternalAccessAspNetCoreResources.ko.xlf → .../ExternalAccessAspNetCoreResources.ko.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.pl.xlf → .../ExternalAccessAspNetCoreResources.pl.xlf b/.../ExternalAccessAspNetCoreResources.pl.xlf → .../ExternalAccessAspNetCoreResources.pl.xlf
diff --git a/...ternalAccessAspNetCoreResources.pt-BR.xlf → ...ternalAccessAspNetCoreResources.pt-BR.xlf b/...ternalAccessAspNetCoreResources.pt-BR.xlf → ...ternalAccessAspNetCoreResources.pt-BR.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.ru.xlf → .../ExternalAccessAspNetCoreResources.ru.xlf b/.../ExternalAccessAspNetCoreResources.ru.xlf → .../ExternalAccessAspNetCoreResources.ru.xlf
diff --git a/.../ExternalAccessAspNetCoreResources.tr.xlf → .../ExternalAccessAspNetCoreResources.tr.xlf b/.../ExternalAccessAspNetCoreResources.tr.xlf → .../ExternalAccessAspNetCoreResources.tr.xlf
diff --git a/...rnalAccessAspNetCoreResources.zh-Hans.xlf → ...rnalAccessAspNetCoreResources.zh-Hans.xlf b/...rnalAccessAspNetCoreResources.zh-Hans.xlf → ...rnalAccessAspNetCoreResources.zh-Hans.xlf
diff --git a/...rnalAccessAspNetCoreResources.zh-Hant.xlf → ...rnalAccessAspNetCoreResources.zh-Hant.xlf b/...rnalAccessAspNetCoreResources.zh-Hant.xlf → ...rnalAccessAspNetCoreResources.zh-Hant.xlf
diff --git a/...etion/OmniSharpCompletionProviderNames.cs → ...etion/OmniSharpCompletionProviderNames.cs b/...etion/OmniSharpCompletionProviderNames.cs → ...etion/OmniSharpCompletionProviderNames.cs
diff --git a/...nComments/OmniSharpDocCommentConverter.cs → ...nComments/OmniSharpDocCommentConverter.cs b/...nComments/OmniSharpDocCommentConverter.cs → ...nComments/OmniSharpDocCommentConverter.cs
diff --git a/...mniSharpSyntaxFormattingOptionsFactory.cs → ...mniSharpSyntaxFormattingOptionsFactory.cs b/...mniSharpSyntaxFormattingOptionsFactory.cs → ...mniSharpSyntaxFormattingOptionsFactory.cs
diff --git a/...nalAccess/Copilot/InternalAPI.Shipped.txt → .../OmniSharp.CSharp/InternalAPI.Shipped.txt b/...nalAccess/Copilot/InternalAPI.Shipped.txt → .../OmniSharp.CSharp/InternalAPI.Shipped.txt
diff --git a/...mniSharp.CSharp/InternalAPI.Unshipped.txt → ...mniSharp.CSharp/InternalAPI.Unshipped.txt b/...mniSharp.CSharp/InternalAPI.Unshipped.txt → ...mniSharp.CSharp/InternalAPI.Unshipped.txt
diff --git a/...is.ExternalAccess.OmniSharp.CSharp.csproj → ...is.ExternalAccess.OmniSharp.CSharp.csproj b/...is.ExternalAccess.OmniSharp.CSharp.csproj → ...is.ExternalAccess.OmniSharp.CSharp.csproj
@@ -31,10 +31,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
     <ProjectReference Include="..\OmniSharp\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj" />
   </ItemGroup>
 

diff --git a/...ernalAccess/Copilot/PublicAPI.Shipped.txt → ...ss/OmniSharp.CSharp/PublicAPI.Shipped.txt b/...ernalAccess/Copilot/PublicAPI.Shipped.txt → ...ss/OmniSharp.CSharp/PublicAPI.Shipped.txt
diff --git a/...nalAccess/Copilot/PublicAPI.Unshipped.txt → .../OmniSharp.CSharp/PublicAPI.Unshipped.txt b/...nalAccess/Copilot/PublicAPI.Unshipped.txt → .../OmniSharp.CSharp/PublicAPI.Unshipped.txt
diff --git a/...niSharpWorkspaceAnalyzerOptionsFactory.cs → ...niSharpWorkspaceAnalyzerOptionsFactory.cs b/...niSharpWorkspaceAnalyzerOptionsFactory.cs → ...niSharpWorkspaceAnalyzerOptionsFactory.cs
diff --git a/...alyzers/OmnisharpAnalyzerLoaderFactory.cs → ...alyzers/OmnisharpAnalyzerLoaderFactory.cs b/...alyzers/OmnisharpAnalyzerLoaderFactory.cs → ...alyzers/OmnisharpAnalyzerLoaderFactory.cs
diff --git a/...CodeActions/OmniSharpCodeActionOptions.cs → ...CodeActions/OmniSharpCodeActionOptions.cs b/...CodeActions/OmniSharpCodeActionOptions.cs → ...CodeActions/OmniSharpCodeActionOptions.cs
diff --git a/...Actions/OmniSharpCodeFixContextFactory.cs → ...Actions/OmniSharpCodeFixContextFactory.cs b/...Actions/OmniSharpCodeFixContextFactory.cs → ...Actions/OmniSharpCodeFixContextFactory.cs
diff --git a/...ActionOperationFactoryWorkspaceService.cs → ...ActionOperationFactoryWorkspaceService.cs b/...ActionOperationFactoryWorkspaceService.cs → ...ActionOperationFactoryWorkspaceService.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CodeRefactorings.WorkspaceServices
 {
-    interface IOmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService
+    internal interface IOmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService
     {
         CodeActionOperation CreateSymbolRenamedOperation(ISymbol symbol, string newName, Solution startingSolution, Solution updatedSolution);
     }

diff --git a/.../Completion/OmniSharpCompletionOptions.cs → .../Completion/OmniSharpCompletionOptions.cs b/.../Completion/OmniSharpCompletionOptions.cs → .../Completion/OmniSharpCompletionOptions.cs
diff --git a/.../Completion/OmniSharpCompletionService.cs → .../Completion/OmniSharpCompletionService.cs b/.../Completion/OmniSharpCompletionService.cs → .../Completion/OmniSharpCompletionService.cs
diff --git a/...harpDocumentationCommentOptionsWrapper.cs → ...harpDocumentationCommentOptionsWrapper.cs b/...harpDocumentationCommentOptionsWrapper.cs → ...harpDocumentationCommentOptionsWrapper.cs
diff --git a/...s/OmniSharpDocumentationCommentSnippet.cs → ...s/OmniSharpDocumentationCommentSnippet.cs b/...s/OmniSharpDocumentationCommentSnippet.cs → ...s/OmniSharpDocumentationCommentSnippet.cs
diff --git a/...arpDocumentationCommentsSnippetService.cs → ...arpDocumentationCommentsSnippetService.cs b/...arpDocumentationCommentsSnippetService.cs → ...arpDocumentationCommentsSnippetService.cs
diff --git a/...s/IOmniSharpExtractClassOptionsService.cs → ...s/IOmniSharpExtractClassOptionsService.cs b/...s/IOmniSharpExtractClassOptionsService.cs → ...s/IOmniSharpExtractClassOptionsService.cs
diff --git a/...mniSharpExtractInterfaceOptionsService.cs → ...mniSharpExtractInterfaceOptionsService.cs b/...mniSharpExtractInterfaceOptionsService.cs → ...mniSharpExtractInterfaceOptionsService.cs
diff --git a/...mniSharp/Formatting/OmniSharpFormatter.cs → ...mniSharp/Formatting/OmniSharpFormatter.cs b/...mniSharp/Formatting/OmniSharpFormatter.cs → ...mniSharp/Formatting/OmniSharpFormatter.cs
diff --git a/...OmniSharpOrganizeImportsOptionsWrapper.cs → ...OmniSharpOrganizeImportsOptionsWrapper.cs b/...OmniSharpOrganizeImportsOptionsWrapper.cs → ...OmniSharpOrganizeImportsOptionsWrapper.cs
diff --git a/...mniSharpSyntaxFormattingOptionsWrapper.cs → ...mniSharpSyntaxFormattingOptionsWrapper.cs b/...mniSharpSyntaxFormattingOptionsWrapper.cs → ...mniSharpSyntaxFormattingOptionsWrapper.cs
diff --git a/...inition/OmniSharpFindDefinitionService.cs → ...inition/OmniSharpFindDefinitionService.cs b/...inition/OmniSharpFindDefinitionService.cs → ...inition/OmniSharpFindDefinitionService.cs
diff --git a/...mentType/OmniSharpImplementTypeOptions.cs → ...mentType/OmniSharpImplementTypeOptions.cs b/...mentType/OmniSharpImplementTypeOptions.cs → ...mentType/OmniSharpImplementTypeOptions.cs
diff --git a/...nlineHints/OmniSharpInlineHintsOptions.cs → ...nlineHints/OmniSharpInlineHintsOptions.cs b/...nlineHints/OmniSharpInlineHintsOptions.cs → ...nlineHints/OmniSharpInlineHintsOptions.cs
diff --git a/...nlineHints/OmniSharpInlineHintsService.cs → ...nlineHints/OmniSharpInlineHintsService.cs b/...nlineHints/OmniSharpInlineHintsService.cs → ...nlineHints/OmniSharpInlineHintsService.cs
diff --git a/...ActionOperationFactoryWorkspaceService.cs → ...ActionOperationFactoryWorkspaceService.cs b/...ActionOperationFactoryWorkspaceService.cs → ...ActionOperationFactoryWorkspaceService.cs
@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Internal.CodeRefactori
 {
     [Shared]
     [ExportWorkspaceService(typeof(ISymbolRenamedCodeActionOperationFactoryWorkspaceService))]
-    class OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService : ISymbolRenamedCodeActionOperationFactoryWorkspaceService
+    internal sealed class OmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService : ISymbolRenamedCodeActionOperationFactoryWorkspaceService
     {
         private readonly IOmniSharpSymbolRenamedCodeActionOperationFactoryWorkspaceService _service;
 

diff --git a/...ss/OmniSharpExtractClassOptionsService.cs → ...ss/OmniSharpExtractClassOptionsService.cs b/...ss/OmniSharpExtractClassOptionsService.cs → ...ss/OmniSharpExtractClassOptionsService.cs
diff --git a/...mniSharpExtractInterfaceOptionsService.cs → ...mniSharpExtractInterfaceOptionsService.cs b/...mniSharpExtractInterfaceOptionsService.cs → ...mniSharpExtractInterfaceOptionsService.cs
diff --git a/...ickMembers/OmniSharpPickMembersService.cs → ...ickMembers/OmniSharpPickMembersService.cs b/...ickMembers/OmniSharpPickMembersService.cs → ...ickMembers/OmniSharpPickMembersService.cs
diff --git a/...alAccess/Debugger/InternalAPI.Shipped.txt → ...lAccess/OmniSharp/InternalAPI.Shipped.txt b/...alAccess/Debugger/InternalAPI.Shipped.txt → ...lAccess/OmniSharp/InternalAPI.Shipped.txt
diff --git a/...ccess/OmniSharp/InternalAPI.Unshipped.txt → ...ccess/OmniSharp/InternalAPI.Unshipped.txt b/...ccess/OmniSharp/InternalAPI.Unshipped.txt → ...ccess/OmniSharp/InternalAPI.Unshipped.txt
diff --git a/...ource/OmniSharpMetadataAsSourceHelpers.cs → ...ource/OmniSharpMetadataAsSourceHelpers.cs b/...ource/OmniSharpMetadataAsSourceHelpers.cs → ...ource/OmniSharpMetadataAsSourceHelpers.cs
diff --git a/...ource/OmniSharpMetadataAsSourceService.cs → ...ource/OmniSharpMetadataAsSourceService.cs b/...ource/OmniSharpMetadataAsSourceService.cs → ...ource/OmniSharpMetadataAsSourceService.cs
diff --git a/...eAnalysis.ExternalAccess.OmniSharp.csproj → ...eAnalysis.ExternalAccess.OmniSharp.csproj b/...eAnalysis.ExternalAccess.OmniSharp.csproj → ...eAnalysis.ExternalAccess.OmniSharp.csproj
@@ -33,10 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...gateTo/OmniSharpNavigateToSearchResult.cs → ...gateTo/OmniSharpNavigateToSearchResult.cs b/...gateTo/OmniSharpNavigateToSearchResult.cs → ...gateTo/OmniSharpNavigateToSearchResult.cs
diff --git a/...ateTo/OmniSharpNavigateToSearchService.cs → ...ateTo/OmniSharpNavigateToSearchService.cs b/...ateTo/OmniSharpNavigateToSearchService.cs → ...ateTo/OmniSharpNavigateToSearchService.cs
diff --git a/...harp/Navigation/OmniSharpNavigableItem.cs → ...harp/Navigation/OmniSharpNavigableItem.cs b/...harp/Navigation/OmniSharpNavigableItem.cs → ...harp/Navigation/OmniSharpNavigableItem.cs
diff --git a/...OmniSharpLineFormattingOptionsProvider.cs → ...OmniSharpLineFormattingOptionsProvider.cs b/...OmniSharpLineFormattingOptionsProvider.cs → ...OmniSharpLineFormattingOptionsProvider.cs
diff --git a/...Options/OmniSharpLineFormattingOptions.cs → ...Options/OmniSharpLineFormattingOptions.cs b/...Options/OmniSharpLineFormattingOptions.cs → ...Options/OmniSharpLineFormattingOptions.cs
diff --git a/...arpLegacyGlobalOptionsWorkspaceService.cs → ...arpLegacyGlobalOptionsWorkspaceService.cs b/...arpLegacyGlobalOptionsWorkspaceService.cs → ...arpLegacyGlobalOptionsWorkspaceService.cs
@@ -40,7 +40,9 @@ public CleanCodeGenerationOptionsProvider CleanCodeGenerationOptionsProvider
             => _provider;
 
         /// TODO: remove. https://github.com/dotnet/roslyn/issues/57283
+#pragma warning disable CA1822 // Mark members as static
         public bool InlineHintsOptionsDisplayAllOverride
+#pragma warning restore CA1822
         {
             get => false;
             set { }

diff --git a/...ckMembers/IOmniSharpPickMembersService.cs → ...ckMembers/IOmniSharpPickMembersService.cs b/...ckMembers/IOmniSharpPickMembersService.cs → ...ckMembers/IOmniSharpPickMembersService.cs
diff --git a/...rnalAccess/Debugger/PublicAPI.Shipped.txt → ...nalAccess/OmniSharp/PublicAPI.Shipped.txt b/...rnalAccess/Debugger/PublicAPI.Shipped.txt → ...nalAccess/OmniSharp/PublicAPI.Shipped.txt
diff --git a/...alAccess/Debugger/PublicAPI.Unshipped.txt → ...lAccess/OmniSharp/PublicAPI.Unshipped.txt b/...alAccess/Debugger/PublicAPI.Unshipped.txt → ...lAccess/OmniSharp/PublicAPI.Unshipped.txt
diff --git a/...mniSharp/Rename/OmniSharpRenameOptions.cs → ...mniSharp/Rename/OmniSharpRenameOptions.cs b/...mniSharp/Rename/OmniSharpRenameOptions.cs → ...mniSharp/Rename/OmniSharpRenameOptions.cs
diff --git a/...cess/OmniSharp/Rename/OmniSharpRenamer.cs → ...cess/OmniSharp/Rename/OmniSharpRenamer.cs b/...cess/OmniSharp/Rename/OmniSharpRenamer.cs → ...cess/OmniSharp/Rename/OmniSharpRenamer.cs
diff --git a/...OmniSharp/Structure/OmniSharpBlockSpan.cs → ...OmniSharp/Structure/OmniSharpBlockSpan.cs b/...OmniSharp/Structure/OmniSharpBlockSpan.cs → ...OmniSharp/Structure/OmniSharpBlockSpan.cs
diff --git a/...harp/Structure/OmniSharpBlockStructure.cs → ...harp/Structure/OmniSharpBlockStructure.cs b/...harp/Structure/OmniSharpBlockStructure.cs → ...harp/Structure/OmniSharpBlockStructure.cs
diff --git a/...ructure/OmniSharpBlockStructureOptions.cs → ...ructure/OmniSharpBlockStructureOptions.cs b/...ructure/OmniSharpBlockStructureOptions.cs → ...ructure/OmniSharpBlockStructureOptions.cs
diff --git a/...ructure/OmniSharpBlockStructureService.cs → ...ructure/OmniSharpBlockStructureService.cs b/...ructure/OmniSharpBlockStructureService.cs → ...ructure/OmniSharpBlockStructureService.cs
diff --git a/...mniSharp/Structure/OmniSharpBlockTypes.cs → ...mniSharp/Structure/OmniSharpBlockTypes.cs b/...mniSharp/Structure/OmniSharpBlockTypes.cs → ...mniSharp/Structure/OmniSharpBlockTypes.cs
diff --git a/...mniSharp/Workspace/OmniSharpDocumentId.cs → ...mniSharp/Workspace/OmniSharpDocumentId.cs b/...mniSharp/Workspace/OmniSharpDocumentId.cs → ...mniSharp/Workspace/OmniSharpDocumentId.cs
diff --git a/...ExternalAccess/OmniSharpTest/EnumTests.cs → ...ExternalAccess/OmniSharpTest/EnumTests.cs b/...ExternalAccess/OmniSharpTest/EnumTests.cs → ...ExternalAccess/OmniSharpTest/EnumTests.cs
diff --git a/...rnalAccess/OmniSharpTest/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests.csproj b/...rnalAccess/OmniSharpTest/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests.csproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests</RootNamespace>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+    <ItemGroup Label="Project References">
+      <ProjectReference Include="..\..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
+      <ProjectReference Include="..\OmniSharp.CSharp\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/...cess/CompilerDeveloperSDK/GlobalUsings.cs → ...cess/CompilerDeveloperSDK/GlobalUsings.cs b/...cess/CompilerDeveloperSDK/GlobalUsings.cs → ...cess/CompilerDeveloperSDK/GlobalUsings.cs
diff --git a/...perSdkLspServiceDocumentRequestHandler.cs → ...perSdkLspServiceDocumentRequestHandler.cs b/...perSdkLspServiceDocumentRequestHandler.cs → ...perSdkLspServiceDocumentRequestHandler.cs
diff --git a/...erDeveloperSdkLspServiceRequestHandler.cs → ...erDeveloperSdkLspServiceRequestHandler.cs b/...erDeveloperSdkLspServiceRequestHandler.cs → ...erDeveloperSdkLspServiceRequestHandler.cs
diff --git a/...lerDeveloperSDK/Handler/RequestContext.cs → ...lerDeveloperSDK/Handler/RequestContext.cs b/...lerDeveloperSDK/Handler/RequestContext.cs → ...lerDeveloperSDK/Handler/RequestContext.cs
diff --git a/...rnalAccess/FSharp/InternalAPI.Shipped.txt → ...pilerDeveloperSDK/InternalAPI.Shipped.txt b/...rnalAccess/FSharp/InternalAPI.Shipped.txt → ...pilerDeveloperSDK/InternalAPI.Shipped.txt
diff --git a/...lerDeveloperSDK/InternalAPI.Unshipped.txt → ...lerDeveloperSDK/InternalAPI.Unshipped.txt b/...lerDeveloperSDK/InternalAPI.Unshipped.txt → ...lerDeveloperSDK/InternalAPI.Unshipped.txt
diff --git a/...AbstractCompilerDeveloperSdkLspService.cs → ...AbstractCompilerDeveloperSdkLspService.cs b/...AbstractCompilerDeveloperSdkLspService.cs → ...AbstractCompilerDeveloperSdkLspService.cs
diff --git a/...tCompilerDeveloperSdkLspServiceFactory.cs → ...tCompilerDeveloperSdkLspServiceFactory.cs b/...tCompilerDeveloperSdkLspServiceFactory.cs → ...tCompilerDeveloperSdkLspServiceFactory.cs
diff --git a/...rvices/CompilerDeveloperSdkLspServices.cs → ...rvices/CompilerDeveloperSdkLspServices.cs b/...rvices/CompilerDeveloperSdkLspServices.cs → ...rvices/CompilerDeveloperSdkLspServices.cs
diff --git a/...es/CompilerDeveloperSdkMethodAttribute.cs → ...es/CompilerDeveloperSdkMethodAttribute.cs b/...es/CompilerDeveloperSdkMethodAttribute.cs → ...es/CompilerDeveloperSdkMethodAttribute.cs
diff --git a/...DeveloperSdkLspServiceFactoryAttribute.cs → ...DeveloperSdkLspServiceFactoryAttribute.cs b/...DeveloperSdkLspServiceFactoryAttribute.cs → ...DeveloperSdkLspServiceFactoryAttribute.cs
diff --git a/...ompilerDeveloperSdkLspServiceAttribute.cs → ...ompilerDeveloperSdkLspServiceAttribute.cs b/...ompilerDeveloperSdkLspServiceAttribute.cs → ...ompilerDeveloperSdkLspServiceAttribute.cs
diff --git a/...xternalAccess.CompilerDeveloperSDK.csproj → ...xternalAccess.CompilerDeveloperSDK.csproj b/...xternalAccess.CompilerDeveloperSDK.csproj → ...xternalAccess.CompilerDeveloperSDK.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\LanguageServer\Microsoft.CodeAnalysis.LanguageServer\Microsoft.CodeAnalysis.LanguageServer.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\Microsoft.CodeAnalysis.LanguageServer\Microsoft.CodeAnalysis.LanguageServer.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ternalAccess/FSharp/PublicAPI.Shipped.txt → ...ompilerDeveloperSDK/PublicAPI.Shipped.txt b/...ternalAccess/FSharp/PublicAPI.Shipped.txt → ...ompilerDeveloperSDK/PublicAPI.Shipped.txt
diff --git a/...rnalAccess/FSharp/PublicAPI.Unshipped.txt → ...pilerDeveloperSDK/PublicAPI.Unshipped.txt b/...rnalAccess/FSharp/PublicAPI.Unshipped.txt → ...pilerDeveloperSDK/PublicAPI.Unshipped.txt
diff --git a/.../VisualDiagnostics/Contracts/Constants.cs → .../VisualDiagnostics/Contracts/Constants.cs b/.../VisualDiagnostics/Contracts/Constants.cs → .../VisualDiagnostics/Contracts/Constants.cs
diff --git a/...tics/Contracts/HotReloadRequestContext.cs → ...tics/Contracts/HotReloadRequestContext.cs b/...tics/Contracts/HotReloadRequestContext.cs → ...tics/Contracts/HotReloadRequestContext.cs
diff --git a/.../Contracts/IHotReloadDiagnosticManager.cs → .../Contracts/IHotReloadDiagnosticManager.cs b/.../Contracts/IHotReloadDiagnosticManager.cs → .../Contracts/IHotReloadDiagnosticManager.cs
diff --git a/...s/Contracts/IHotReloadDiagnosticSource.cs → ...s/Contracts/IHotReloadDiagnosticSource.cs b/...s/Contracts/IHotReloadDiagnosticSource.cs → ...s/Contracts/IHotReloadDiagnosticSource.cs
diff --git a/...cts/IHotReloadDiagnosticSourceProvider.cs → ...cts/IHotReloadDiagnosticSourceProvider.cs b/...cts/IHotReloadDiagnosticSourceProvider.cs → ...cts/IHotReloadDiagnosticSourceProvider.cs
diff --git a/...acts/IVisualDiagnosticsLanguageService.cs → ...acts/IVisualDiagnosticsLanguageService.cs b/...acts/IVisualDiagnosticsLanguageService.cs → ...acts/IVisualDiagnosticsLanguageService.cs
diff --git a/...cs/Internal/HotReloadDiagnosticManager.cs → ...cs/Internal/HotReloadDiagnosticManager.cs b/...cs/Internal/HotReloadDiagnosticManager.cs → ...cs/Internal/HotReloadDiagnosticManager.cs
diff --git a/...ics/Internal/HotReloadDiagnosticSource.cs → ...ics/Internal/HotReloadDiagnosticSource.cs b/...ics/Internal/HotReloadDiagnosticSource.cs → ...ics/Internal/HotReloadDiagnosticSource.cs
diff --git a/...rnal/HotReloadDiagnosticSourceProvider.cs → ...rnal/HotReloadDiagnosticSourceProvider.cs b/...rnal/HotReloadDiagnosticSourceProvider.cs → ...rnal/HotReloadDiagnosticSourceProvider.cs
diff --git a/...ternal/VisualDiagnosticsServiceFactory.cs → ...ternal/VisualDiagnosticsServiceFactory.cs b/...ternal/VisualDiagnosticsServiceFactory.cs → ...ternal/VisualDiagnosticsServiceFactory.cs
diff --git a/.../OmniSharp.CSharp/InternalAPI.Shipped.txt → ...VisualDiagnostics/InternalAPI.Shipped.txt b/.../OmniSharp.CSharp/InternalAPI.Shipped.txt → ...VisualDiagnostics/InternalAPI.Shipped.txt
diff --git a/...sualDiagnostics/InternalAPI.Unshipped.txt → ...sualDiagnostics/InternalAPI.Unshipped.txt b/...sualDiagnostics/InternalAPI.Unshipped.txt → ...sualDiagnostics/InternalAPI.Unshipped.txt
diff --git a/...s.ExternalAccess.VisualDiagnostics.csproj → ...s.ExternalAccess.VisualDiagnostics.csproj b/...s.ExternalAccess.VisualDiagnostics.csproj → ...s.ExternalAccess.VisualDiagnostics.csproj
@@ -20,10 +20,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.DesignTools.CodeAnalysis.Diagnostics" Key="$(VisualStudioKey)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...ss/OmniSharp.CSharp/PublicAPI.Shipped.txt → ...s/VisualDiagnostics/PublicAPI.Shipped.txt b/...ss/OmniSharp.CSharp/PublicAPI.Shipped.txt → ...s/VisualDiagnostics/PublicAPI.Shipped.txt
diff --git a/...VisualDiagnostics/PublicAPI.Unshipped.txt → ...VisualDiagnostics/PublicAPI.Unshipped.txt b/...VisualDiagnostics/PublicAPI.Unshipped.txt → ...VisualDiagnostics/PublicAPI.Unshipped.txt
diff --git a/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -72,8 +72,8 @@
     <ProjectReference Include="..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
 
     <!-- Not directly referenced but needed for Route embedded language features -->
-    <ProjectReference Include="..\..\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\VisualDiagnostics\Microsoft.CodeAnalysis.ExternalAccess.VisualDiagnostics.csproj" />
+    <ProjectReference Include="..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
+    <ProjectReference Include="..\ExternalAccess\VisualDiagnostics\Microsoft.CodeAnalysis.ExternalAccess.VisualDiagnostics.csproj" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\Xaml\Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj" />
   </ItemGroup>
 

diff --git a/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -38,12 +38,12 @@
     <ProjectReference Include="..\..\Interactive\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Scripting\CSharp\Microsoft.CodeAnalysis.CSharp.Scripting.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Apex\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\EditorConfigGenerator\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\VisualStudio\ExternalAccess\Apex\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\EditorFeatures\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\EditorFeatures\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\VisualStudio\ExternalAccess\EditorConfigGenerator\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\VisualStudio\ExternalAccess\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\VisualStudio\LiveShare\Impl\Microsoft.VisualStudio.LanguageServices.LiveShare.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" PrivateAssets="all" />

diff --git a/...rnalAccess/OmniSharpTest/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests.csproj b/...rnalAccess/OmniSharpTest/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests.csproj
diff --git a/...onousOperationListenerProviderAccessor.cs → ...onousOperationListenerProviderAccessor.cs b/...onousOperationListenerProviderAccessor.cs → ...onousOperationListenerProviderAccessor.cs
diff --git a/...onousOperationListenerProviderAccessor.cs → ...onousOperationListenerProviderAccessor.cs b/...onousOperationListenerProviderAccessor.cs → ...onousOperationListenerProviderAccessor.cs
diff --git a/...lAccess/OmniSharp/InternalAPI.Shipped.txt → ...ternalAccess/Apex/InternalAPI.Shipped.txt b/...lAccess/OmniSharp/InternalAPI.Shipped.txt → ...ternalAccess/Apex/InternalAPI.Shipped.txt
diff --git a/...rnalAccess/Apex/InternalAPI.Unshipped.txt → ...rnalAccess/Apex/InternalAPI.Unshipped.txt b/...rnalAccess/Apex/InternalAPI.Unshipped.txt → ...rnalAccess/Apex/InternalAPI.Unshipped.txt
diff --git a/...t.CodeAnalysis.ExternalAccess.Apex.csproj → ...t.CodeAnalysis.ExternalAccess.Apex.csproj b/...t.CodeAnalysis.ExternalAccess.Apex.csproj → ...t.CodeAnalysis.ExternalAccess.Apex.csproj
@@ -23,9 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...nalAccess/OmniSharp/PublicAPI.Shipped.txt → ...ExternalAccess/Apex/PublicAPI.Shipped.txt b/...nalAccess/OmniSharp/PublicAPI.Shipped.txt → ...ExternalAccess/Apex/PublicAPI.Shipped.txt
diff --git a/.../OmniSharp.CSharp/PublicAPI.Unshipped.txt → ...ternalAccess/Apex/PublicAPI.Unshipped.txt b/.../OmniSharp.CSharp/PublicAPI.Unshipped.txt → ...ternalAccess/Apex/PublicAPI.Unshipped.txt
diff --git a/...igGenerator/Api/IEditorConfigGenerator.cs → ...igGenerator/Api/IEditorConfigGenerator.cs b/...igGenerator/Api/IEditorConfigGenerator.cs → ...igGenerator/Api/IEditorConfigGenerator.cs
diff --git a/...rConfigGenerator/EditorConfigGenerator.cs → ...rConfigGenerator/EditorConfigGenerator.cs b/...rConfigGenerator/EditorConfigGenerator.cs → ...rConfigGenerator/EditorConfigGenerator.cs
diff --git a/...ternalAccess.EditorConfigGenerator.csproj → ...ternalAccess.EditorConfigGenerator.csproj b/...ternalAccess.EditorConfigGenerator.csproj → ...ternalAccess.EditorConfigGenerator.csproj
@@ -12,9 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\VisualStudio\Core\Impl\Microsoft.VisualStudio.LanguageServices.Implementation.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\Core\Impl\Microsoft.VisualStudio.LanguageServices.Implementation.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...lassification/FSharpClassificationTags.cs → ...lassification/FSharpClassificationTags.cs b/...lassification/FSharpClassificationTags.cs → ...lassification/FSharpClassificationTags.cs
diff --git a/...ification/IFSharpClassificationService.cs → ...ification/IFSharpClassificationService.cs b/...ification/IFSharpClassificationService.cs → ...ification/IFSharpClassificationService.cs
diff --git a/.../Completion/FSharpCommonCompletionItem.cs → .../Completion/FSharpCommonCompletionItem.cs b/.../Completion/FSharpCommonCompletionItem.cs → .../Completion/FSharpCommonCompletionItem.cs
diff --git a/...pletion/FSharpCommonCompletionProvider.cs → ...pletion/FSharpCommonCompletionProvider.cs b/...pletion/FSharpCommonCompletionProvider.cs → ...pletion/FSharpCommonCompletionProvider.cs
diff --git a/...letion/FSharpCommonCompletionUtilities.cs → ...letion/FSharpCommonCompletionUtilities.cs b/...letion/FSharpCommonCompletionUtilities.cs → ...letion/FSharpCommonCompletionUtilities.cs
diff --git a/...ompletion/FSharpCompletionProviderBase.cs → ...ompletion/FSharpCompletionProviderBase.cs b/...ompletion/FSharpCompletionProviderBase.cs → ...ompletion/FSharpCompletionProviderBase.cs
diff --git a/...n/FSharpCompletionServiceWithProviders.cs → ...n/FSharpCompletionServiceWithProviders.cs b/...n/FSharpCompletionServiceWithProviders.cs → ...n/FSharpCompletionServiceWithProviders.cs
diff --git a/...etion/FSharpFileSystemCompletionHelper.cs → ...etion/FSharpFileSystemCompletionHelper.cs b/...etion/FSharpFileSystemCompletionHelper.cs → ...etion/FSharpFileSystemCompletionHelper.cs
diff --git a/...letion/IFSharpCommonCompletionProvider.cs → ...letion/IFSharpCommonCompletionProvider.cs b/...letion/IFSharpCommonCompletionProvider.cs → ...letion/IFSharpCommonCompletionProvider.cs
diff --git a/...Diagnostics/FSharpDiagnosticCustomTags.cs → ...Diagnostics/FSharpDiagnosticCustomTags.cs b/...Diagnostics/FSharpDiagnosticCustomTags.cs → ...Diagnostics/FSharpDiagnosticCustomTags.cs
diff --git a/...arp/Diagnostics/FSharpIDEDiagnosticIds.cs → ...arp/Diagnostics/FSharpIDEDiagnosticIds.cs b/...arp/Diagnostics/FSharpIDEDiagnosticIds.cs → ...arp/Diagnostics/FSharpIDEDiagnosticIds.cs
diff --git a/...stics/IFSharpDiagnosticAnalyzerService.cs → ...stics/IFSharpDiagnosticAnalyzerService.cs b/...stics/IFSharpDiagnosticAnalyzerService.cs → ...stics/IFSharpDiagnosticAnalyzerService.cs
diff --git a/...tics/IFSharpDocumentDiagnosticAnalyzer.cs → ...tics/IFSharpDocumentDiagnosticAnalyzer.cs b/...tics/IFSharpDocumentDiagnosticAnalyzer.cs → ...tics/IFSharpDocumentDiagnosticAnalyzer.cs
diff --git a/.../IFSharpSimplifyNameDiagnosticAnalyzer.cs → .../IFSharpSimplifyNameDiagnosticAnalyzer.cs b/.../IFSharpSimplifyNameDiagnosticAnalyzer.cs → .../IFSharpSimplifyNameDiagnosticAnalyzer.cs
diff --git a/...rpUnusedDeclarationsDiagnosticAnalyzer.cs → ...rpUnusedDeclarationsDiagnosticAnalyzer.cs b/...rpUnusedDeclarationsDiagnosticAnalyzer.cs → ...rpUnusedDeclarationsDiagnosticAnalyzer.cs
diff --git a/...s/IFSharpUnusedOpensDiagnosticAnalyzer.cs → ...s/IFSharpUnusedOpensDiagnosticAnalyzer.cs b/...s/IFSharpUnusedOpensDiagnosticAnalyzer.cs → ...s/IFSharpUnusedOpensDiagnosticAnalyzer.cs
diff --git a/...hting/IFSharpDocumentHighlightsService.cs → ...hting/IFSharpDocumentHighlightsService.cs b/...hting/IFSharpDocumentHighlightsService.cs → ...hting/IFSharpDocumentHighlightsService.cs
diff --git a/...rp/Editor/AutoFormattingOptionsWrapper.cs → ...rp/Editor/AutoFormattingOptionsWrapper.cs b/...rp/Editor/AutoFormattingOptionsWrapper.cs → ...rp/Editor/AutoFormattingOptionsWrapper.cs
diff --git a/...s/FSharp/Editor/FSharpContentTypeNames.cs → ...s/FSharp/Editor/FSharpContentTypeNames.cs b/...s/FSharp/Editor/FSharpContentTypeNames.cs → ...s/FSharp/Editor/FSharpContentTypeNames.cs
diff --git a/.../FSharp/Editor/FSharpNavigationBarItem.cs → .../FSharp/Editor/FSharpNavigationBarItem.cs b/.../FSharp/Editor/FSharpNavigationBarItem.cs → .../FSharp/Editor/FSharpNavigationBarItem.cs
diff --git a/...or/FindUsages/IFSharpFindUsagesContext.cs → ...or/FindUsages/IFSharpFindUsagesContext.cs b/...or/FindUsages/IFSharpFindUsagesContext.cs → ...or/FindUsages/IFSharpFindUsagesContext.cs
diff --git a/...or/FindUsages/IFSharpFindUsagesService.cs → ...or/FindUsages/IFSharpFindUsagesService.cs b/...or/FindUsages/IFSharpFindUsagesService.cs → ...or/FindUsages/IFSharpFindUsagesService.cs
diff --git a/...cess/FSharp/Editor/IFSharpBraceMatcher.cs → ...cess/FSharp/Editor/IFSharpBraceMatcher.cs b/...cess/FSharp/Editor/IFSharpBraceMatcher.cs → ...cess/FSharp/Editor/IFSharpBraceMatcher.cs
diff --git a/.../Editor/IFSharpEditorFormattingService.cs → .../Editor/IFSharpEditorFormattingService.cs b/.../Editor/IFSharpEditorFormattingService.cs → .../Editor/IFSharpEditorFormattingService.cs
diff --git a/...harpEditorFormattingServiceWithOptions.cs → ...harpEditorFormattingServiceWithOptions.cs b/...harpEditorFormattingServiceWithOptions.cs → ...harpEditorFormattingServiceWithOptions.cs
diff --git a/...ditor/IFSharpEditorInlineRenameService.cs → ...ditor/IFSharpEditorInlineRenameService.cs b/...ditor/IFSharpEditorInlineRenameService.cs → ...ditor/IFSharpEditorInlineRenameService.cs
diff --git a/...rp/Editor/IFSharpGoToDefinitionService.cs → ...rp/Editor/IFSharpGoToDefinitionService.cs b/...rp/Editor/IFSharpGoToDefinitionService.cs → ...rp/Editor/IFSharpGoToDefinitionService.cs
diff --git a/...Sharp/Editor/IFSharpIndentationService.cs → ...Sharp/Editor/IFSharpIndentationService.cs b/...Sharp/Editor/IFSharpIndentationService.cs → ...Sharp/Editor/IFSharpIndentationService.cs
diff --git a/...Editor/IFSharpNavigationBarItemService.cs → ...Editor/IFSharpNavigationBarItemService.cs b/...Editor/IFSharpNavigationBarItemService.cs → ...Editor/IFSharpNavigationBarItemService.cs
diff --git a/...gging/FSharpBreakpointResolutionResult.cs → ...gging/FSharpBreakpointResolutionResult.cs b/...gging/FSharpBreakpointResolutionResult.cs → ...gging/FSharpBreakpointResolutionResult.cs
diff --git a/...ation/Debugging/FSharpDebugDataTipInfo.cs → ...ation/Debugging/FSharpDebugDataTipInfo.cs b/...ation/Debugging/FSharpDebugDataTipInfo.cs → ...ation/Debugging/FSharpDebugDataTipInfo.cs
diff --git a/...tion/Debugging/FSharpDebugLocationInfo.cs → ...tion/Debugging/FSharpDebugLocationInfo.cs b/...tion/Debugging/FSharpDebugLocationInfo.cs → ...tion/Debugging/FSharpDebugLocationInfo.cs
diff --git a/...ing/IFSharpBreakpointResolutionService.cs → ...ing/IFSharpBreakpointResolutionService.cs b/...ing/IFSharpBreakpointResolutionService.cs → ...ing/IFSharpBreakpointResolutionService.cs
diff --git a/...ugging/IFSharpLanguageDebugInfoService.cs → ...ugging/IFSharpLanguageDebugInfoService.cs b/...ugging/IFSharpLanguageDebugInfoService.cs → ...ugging/IFSharpLanguageDebugInfoService.cs
diff --git a/...or/InlineRename/FSharpInlineRenameInfo.cs → ...or/InlineRename/FSharpInlineRenameInfo.cs b/...or/InlineRename/FSharpInlineRenameInfo.cs → ...or/InlineRename/FSharpInlineRenameInfo.cs
diff --git a/...nlineRename/FSharpInlineRenameLocation.cs → ...nlineRename/FSharpInlineRenameLocation.cs b/...nlineRename/FSharpInlineRenameLocation.cs → ...nlineRename/FSharpInlineRenameLocation.cs
diff --git a/...neRename/FSharpInlineRenameLocationSet.cs → ...neRename/FSharpInlineRenameLocationSet.cs b/...neRename/FSharpInlineRenameLocationSet.cs → ...neRename/FSharpInlineRenameLocationSet.cs
diff --git a/...neRename/FSharpInlineRenameReplacement.cs → ...neRename/FSharpInlineRenameReplacement.cs b/...neRename/FSharpInlineRenameReplacement.cs → ...neRename/FSharpInlineRenameReplacement.cs
diff --git a/...name/FSharpInlineRenameReplacementInfo.cs → ...name/FSharpInlineRenameReplacementInfo.cs b/...name/FSharpInlineRenameReplacementInfo.cs → ...name/FSharpInlineRenameReplacementInfo.cs
diff --git a/...name/FSharpInlineRenameReplacementKind.cs → ...name/FSharpInlineRenameReplacementKind.cs b/...name/FSharpInlineRenameReplacementKind.cs → ...name/FSharpInlineRenameReplacementKind.cs
diff --git a/...SharpInlineRenameServiceImplementation.cs → ...SharpInlineRenameServiceImplementation.cs b/...SharpInlineRenameServiceImplementation.cs → ...SharpInlineRenameServiceImplementation.cs
diff --git a/...sions/FSharpDependencyObjectExtensions.cs → ...sions/FSharpDependencyObjectExtensions.cs b/...sions/FSharpDependencyObjectExtensions.cs → ...sions/FSharpDependencyObjectExtensions.cs
diff --git a/.../Utilities/FSharpClassificationTypeMap.cs → .../Utilities/FSharpClassificationTypeMap.cs b/.../Utilities/FSharpClassificationTypeMap.cs → .../Utilities/FSharpClassificationTypeMap.cs
diff --git a/...ExternalAccessFSharpResources.Designer.cs → ...ExternalAccessFSharpResources.Designer.cs b/...ExternalAccessFSharpResources.Designer.cs → ...ExternalAccessFSharpResources.Designer.cs
diff --git a/...FSharp/ExternalAccessFSharpResources.resx → ...FSharp/ExternalAccessFSharpResources.resx b/...FSharp/ExternalAccessFSharpResources.resx → ...FSharp/ExternalAccessFSharpResources.resx
diff --git a/...ternalAccess/FSharp/FSharpDocumentSpan.cs → ...ternalAccess/FSharp/FSharpDocumentSpan.cs b/...ternalAccess/FSharp/FSharpDocumentSpan.cs → ...ternalAccess/FSharp/FSharpDocumentSpan.cs
diff --git a/...s/FSharp/FSharpEditorFeaturesResources.cs → ...s/FSharp/FSharpEditorFeaturesResources.cs b/...s/FSharp/FSharpEditorFeaturesResources.cs → ...s/FSharp/FSharpEditorFeaturesResources.cs
diff --git a/...ernalAccess/FSharp/FSharpGlobalOptions.cs → ...ernalAccess/FSharp/FSharpGlobalOptions.cs b/...ernalAccess/FSharp/FSharpGlobalOptions.cs → ...ernalAccess/FSharp/FSharpGlobalOptions.cs
diff --git a/...ools/ExternalAccess/FSharp/FSharpGlyph.cs → ...udio/ExternalAccess/FSharp/FSharpGlyph.cs b/...ools/ExternalAccess/FSharp/FSharpGlyph.cs → ...udio/ExternalAccess/FSharp/FSharpGlyph.cs
diff --git a/.../ExternalAccess/FSharp/FSharpGlyphTags.cs → .../ExternalAccess/FSharp/FSharpGlyphTags.cs b/.../ExternalAccess/FSharp/FSharpGlyphTags.cs → .../ExternalAccess/FSharp/FSharpGlyphTags.cs
diff --git a/...FSharp/FindUsages/FSharpDefinitionItem.cs → ...FSharp/FindUsages/FSharpDefinitionItem.cs b/...FSharp/FindUsages/FSharpDefinitionItem.cs → ...FSharp/FindUsages/FSharpDefinitionItem.cs
diff --git a/...p/FindUsages/FSharpSourceReferenceItem.cs → ...p/FindUsages/FSharpSourceReferenceItem.cs b/...p/FindUsages/FSharpSourceReferenceItem.cs → ...p/FindUsages/FSharpSourceReferenceItem.cs
diff --git a/...efinition/IFSharpFindDefinitionService.cs → ...efinition/IFSharpFindDefinitionService.cs b/...efinition/IFSharpFindDefinitionService.cs → ...efinition/IFSharpFindDefinitionService.cs
diff --git a/...ss/FSharp/InlineHints/FSharpInlineHint.cs → ...ss/FSharp/InlineHints/FSharpInlineHint.cs b/...ss/FSharp/InlineHints/FSharpInlineHint.cs → ...ss/FSharp/InlineHints/FSharpInlineHint.cs
diff --git a/.../InlineHints/IFSharpInlineHintsService.cs → .../InlineHints/IFSharpInlineHintsService.cs b/.../InlineHints/IFSharpInlineHintsService.cs → .../InlineHints/IFSharpInlineHintsService.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.InlineHints
 {
     /// <inheritdoc cref="IInlineHintsService"/>
-    interface IFSharpInlineHintsService
+    internal interface IFSharpInlineHintsService
     {
         /// <inheritdoc cref="IInlineHintsService.GetInlineHintsAsync"/>
         Task<ImmutableArray<FSharpInlineHint>> GetInlineHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);

diff --git a/...sification/FSharpClassificationService.cs → ...sification/FSharpClassificationService.cs b/...sification/FSharpClassificationService.cs → ...sification/FSharpClassificationService.cs
diff --git a/...election/FSharpCommentSelectionService.cs → ...election/FSharpCommentSelectionService.cs b/...election/FSharpCommentSelectionService.cs → ...election/FSharpCommentSelectionService.cs
diff --git a/...FSharpInternalCommonCompletionProvider.cs → ...FSharpInternalCommonCompletionProvider.cs b/...FSharpInternalCommonCompletionProvider.cs → ...FSharpInternalCommonCompletionProvider.cs
diff --git a/...ostics/FSharpDiagnosticAnalyzerService.cs → ...ostics/FSharpDiagnosticAnalyzerService.cs b/...ostics/FSharpDiagnosticAnalyzerService.cs → ...ostics/FSharpDiagnosticAnalyzerService.cs
diff --git a/...stics/FSharpDocumentDiagnosticAnalyzer.cs → ...stics/FSharpDocumentDiagnosticAnalyzer.cs b/...stics/FSharpDocumentDiagnosticAnalyzer.cs → ...stics/FSharpDocumentDiagnosticAnalyzer.cs
diff --git a/...s/FSharpSimplifyNameDiagnosticAnalyzer.cs → ...s/FSharpSimplifyNameDiagnosticAnalyzer.cs b/...s/FSharpSimplifyNameDiagnosticAnalyzer.cs → ...s/FSharpSimplifyNameDiagnosticAnalyzer.cs
diff --git a/...stics/FSharpUnusedDeclarationsAnalyzer.cs → ...stics/FSharpUnusedDeclarationsAnalyzer.cs b/...stics/FSharpUnusedDeclarationsAnalyzer.cs → ...stics/FSharpUnusedDeclarationsAnalyzer.cs
diff --git a/...cs/FSharpUnusedOpensDiagnosticAnalyzer.cs → ...cs/FSharpUnusedOpensDiagnosticAnalyzer.cs b/...cs/FSharpUnusedOpensDiagnosticAnalyzer.cs → ...cs/FSharpUnusedOpensDiagnosticAnalyzer.cs
diff --git a/...ghting/FSharpDocumentHighlightsService.cs → ...ghting/FSharpDocumentHighlightsService.cs b/...ghting/FSharpDocumentHighlightsService.cs → ...ghting/FSharpDocumentHighlightsService.cs
diff --git a/...arp/Internal/Editor/FSharpBraceMatcher.cs → ...arp/Internal/Editor/FSharpBraceMatcher.cs b/...arp/Internal/Editor/FSharpBraceMatcher.cs → ...arp/Internal/Editor/FSharpBraceMatcher.cs
diff --git a/...ditor/FSharpContentTypeLanguageService.cs → ...ditor/FSharpContentTypeLanguageService.cs b/...ditor/FSharpContentTypeLanguageService.cs → ...ditor/FSharpContentTypeLanguageService.cs
diff --git a/...Editor/FSharpDefinitionLocationService.cs → ...Editor/FSharpDefinitionLocationService.cs b/...Editor/FSharpDefinitionLocationService.cs → ...Editor/FSharpDefinitionLocationService.cs
diff --git a/...l/Editor/FSharpEditorFormattingService.cs → ...l/Editor/FSharpEditorFormattingService.cs b/...l/Editor/FSharpEditorFormattingService.cs → ...l/Editor/FSharpEditorFormattingService.cs
diff --git a/...Editor/FSharpEditorInlineRenameService.cs → ...Editor/FSharpEditorInlineRenameService.cs b/...Editor/FSharpEditorInlineRenameService.cs → ...Editor/FSharpEditorInlineRenameService.cs
diff --git a/.../Editor/FSharpNavigationBarItemService.cs → .../Editor/FSharpNavigationBarItemService.cs b/.../Editor/FSharpNavigationBarItemService.cs → .../Editor/FSharpNavigationBarItemService.cs
diff --git a/...ernal/Editor/FSharpSmartIndentProvider.cs → ...ernal/Editor/FSharpSmartIndentProvider.cs b/...ernal/Editor/FSharpSmartIndentProvider.cs → ...ernal/Editor/FSharpSmartIndentProvider.cs
diff --git a/...tor/FindUsages/FSharpFindUsagesContext.cs → ...tor/FindUsages/FSharpFindUsagesContext.cs b/...tor/FindUsages/FSharpFindUsagesContext.cs → ...tor/FindUsages/FSharpFindUsagesContext.cs
diff --git a/...tor/FindUsages/FSharpFindUsagesService.cs → ...tor/FindUsages/FSharpFindUsagesService.cs b/...tor/FindUsages/FSharpFindUsagesService.cs → ...tor/FindUsages/FSharpFindUsagesService.cs
diff --git a/...ging/FSharpBreakpointResolutionService.cs → ...ging/FSharpBreakpointResolutionService.cs b/...ging/FSharpBreakpointResolutionService.cs → ...ging/FSharpBreakpointResolutionService.cs
diff --git a/...bugging/FSharpLanguageDebugInfoService.cs → ...bugging/FSharpLanguageDebugInfoService.cs b/...bugging/FSharpLanguageDebugInfoService.cs → ...bugging/FSharpLanguageDebugInfoService.cs
diff --git a/.../Internal/FSharpContentTypeDefinitions.cs → .../Internal/FSharpContentTypeDefinitions.cs b/.../Internal/FSharpContentTypeDefinitions.cs → .../Internal/FSharpContentTypeDefinitions.cs
diff --git a/...ess/FSharp/Internal/FSharpGlyphHelpers.cs → ...ess/FSharp/Internal/FSharpGlyphHelpers.cs b/...ess/FSharp/Internal/FSharpGlyphHelpers.cs → ...ess/FSharp/Internal/FSharpGlyphHelpers.cs
diff --git a/...l/InlineHints/FSharpInlineHintsService.cs → ...l/InlineHints/FSharpInlineHintsService.cs b/...l/InlineHints/FSharpInlineHintsService.cs → ...l/InlineHints/FSharpInlineHintsService.cs
diff --git a/...ateTo/FSharpNavigateToMatchKindHelpers.cs → ...ateTo/FSharpNavigateToMatchKindHelpers.cs b/...ateTo/FSharpNavigateToMatchKindHelpers.cs → ...ateTo/FSharpNavigateToMatchKindHelpers.cs
diff --git a/...vigateTo/FSharpNavigateToSearchService.cs → ...vigateTo/FSharpNavigateToSearchService.cs b/...vigateTo/FSharpNavigateToSearchService.cs → ...vigateTo/FSharpNavigateToSearchService.cs
diff --git a/...o/InternalFSharpNavigateToSearchResult.cs → ...o/InternalFSharpNavigateToSearchResult.cs b/...o/InternalFSharpNavigateToSearchResult.cs → ...o/InternalFSharpNavigateToSearchResult.cs
diff --git a/...rpCrossLanguageSymbolNavigationService.cs → ...rpCrossLanguageSymbolNavigationService.cs b/...rpCrossLanguageSymbolNavigationService.cs → ...rpCrossLanguageSymbolNavigationService.cs
diff --git a/...Navigation/FSharpFindDefinitionService.cs → ...Navigation/FSharpFindDefinitionService.cs b/...Navigation/FSharpFindDefinitionService.cs → ...Navigation/FSharpFindDefinitionService.cs
diff --git a/...Navigation/InternalFSharpNavigableItem.cs → ...Navigation/InternalFSharpNavigableItem.cs b/...Navigation/InternalFSharpNavigableItem.cs → ...Navigation/InternalFSharpNavigableItem.cs
diff --git a/...natureHelp/FSharpSignatureHelpProvider.cs → ...natureHelp/FSharpSignatureHelpProvider.cs b/...natureHelp/FSharpSignatureHelpProvider.cs → ...natureHelp/FSharpSignatureHelpProvider.cs
diff --git a/...SharpSignatureHelpTriggerReasonHelpers.cs → ...SharpSignatureHelpTriggerReasonHelpers.cs b/...SharpSignatureHelpTriggerReasonHelpers.cs → ...SharpSignatureHelpTriggerReasonHelpers.cs
diff --git a/.../Structure/FSharpBlockStructureService.cs → .../Structure/FSharpBlockStructureService.cs b/.../Structure/FSharpBlockStructureService.cs → .../Structure/FSharpBlockStructureService.cs
diff --git a/...arpProjectExternalErrorReporterFactory.cs → ...arpProjectExternalErrorReporterFactory.cs b/...arpProjectExternalErrorReporterFactory.cs → ...arpProjectExternalErrorReporterFactory.cs
diff --git a/.../FSharpSignatureHelpClassifierProvider.cs → .../FSharpSignatureHelpClassifierProvider.cs b/.../FSharpSignatureHelpClassifierProvider.cs → .../FSharpSignatureHelpClassifierProvider.cs
diff --git a/...VisualDiagnostics/InternalAPI.Shipped.txt → ...rnalAccess/FSharp/InternalAPI.Shipped.txt b/...VisualDiagnostics/InternalAPI.Shipped.txt → ...rnalAccess/FSharp/InternalAPI.Shipped.txt
diff --git a/...alAccess/FSharp/InternalAPI.Unshipped.txt → ...alAccess/FSharp/InternalAPI.Unshipped.txt b/...alAccess/FSharp/InternalAPI.Unshipped.txt → ...alAccess/FSharp/InternalAPI.Unshipped.txt
diff --git a/.../FSharpVisualStudioWorkspaceExtensions.cs → .../FSharpVisualStudioWorkspaceExtensions.cs b/.../FSharpVisualStudioWorkspaceExtensions.cs → .../FSharpVisualStudioWorkspaceExtensions.cs
diff --git a/...CodeAnalysis.ExternalAccess.FSharp.csproj → ...CodeAnalysis.ExternalAccess.FSharp.csproj b/...CodeAnalysis.ExternalAccess.FSharp.csproj → ...CodeAnalysis.ExternalAccess.FSharp.csproj
@@ -32,13 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
+    <ProjectReference Include="..\..\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
     <ProjectReference Include="..\..\..\EditorFeatures\CSharp\Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...rp/NavigateTo/FSharpNavigateToItemKind.cs → ...rp/NavigateTo/FSharpNavigateToItemKind.cs b/...rp/NavigateTo/FSharpNavigateToItemKind.cs → ...rp/NavigateTo/FSharpNavigateToItemKind.cs
diff --git a/...p/NavigateTo/FSharpNavigateToMatchKind.cs → ...p/NavigateTo/FSharpNavigateToMatchKind.cs b/...p/NavigateTo/FSharpNavigateToMatchKind.cs → ...p/NavigateTo/FSharpNavigateToMatchKind.cs
diff --git a/...avigateTo/FSharpNavigateToSearchResult.cs → ...avigateTo/FSharpNavigateToSearchResult.cs b/...avigateTo/FSharpNavigateToSearchResult.cs → ...avigateTo/FSharpNavigateToSearchResult.cs
diff --git a/...igateTo/IFSharpNavigateToSearchService.cs → ...igateTo/IFSharpNavigateToSearchService.cs b/...igateTo/IFSharpNavigateToSearchService.cs → ...igateTo/IFSharpNavigateToSearchService.cs
diff --git a/...gation/FSharpDocumentNavigationService.cs → ...gation/FSharpDocumentNavigationService.cs b/...gation/FSharpDocumentNavigationService.cs → ...gation/FSharpDocumentNavigationService.cs
diff --git a/.../FSharp/Navigation/FSharpNavigableItem.cs → .../FSharp/Navigation/FSharpNavigableItem.cs b/.../FSharp/Navigation/FSharpNavigableItem.cs → .../FSharp/Navigation/FSharpNavigableItem.cs
diff --git a/...rpCrossLanguageSymbolNavigationService.cs → ...rpCrossLanguageSymbolNavigationService.cs b/...rpCrossLanguageSymbolNavigationService.cs → ...rpCrossLanguageSymbolNavigationService.cs
diff --git a/...ation/IFSharpDocumentNavigationService.cs → ...ation/IFSharpDocumentNavigationService.cs b/...ation/IFSharpDocumentNavigationService.cs → ...ation/IFSharpDocumentNavigationService.cs
diff --git a/...s/VisualDiagnostics/PublicAPI.Shipped.txt → ...ternalAccess/FSharp/PublicAPI.Shipped.txt b/...s/VisualDiagnostics/PublicAPI.Shipped.txt → ...ternalAccess/FSharp/PublicAPI.Shipped.txt
diff --git a/...lAccess/OmniSharp/PublicAPI.Unshipped.txt → ...rnalAccess/FSharp/PublicAPI.Unshipped.txt b/...lAccess/OmniSharp/PublicAPI.Unshipped.txt → ...rnalAccess/FSharp/PublicAPI.Unshipped.txt
diff --git a/.../SignatureHelp/FSharpSignatureHelpItem.cs → .../SignatureHelp/FSharpSignatureHelpItem.cs b/.../SignatureHelp/FSharpSignatureHelpItem.cs → .../SignatureHelp/FSharpSignatureHelpItem.cs
diff --git a/...SignatureHelp/FSharpSignatureHelpItems.cs → ...SignatureHelp/FSharpSignatureHelpItems.cs b/...SignatureHelp/FSharpSignatureHelpItems.cs → ...SignatureHelp/FSharpSignatureHelpItems.cs
diff --git a/...atureHelp/FSharpSignatureHelpParameter.cs → ...atureHelp/FSharpSignatureHelpParameter.cs b/...atureHelp/FSharpSignatureHelpParameter.cs → ...atureHelp/FSharpSignatureHelpParameter.cs
diff --git a/...ureHelp/FSharpSignatureHelpTriggerInfo.cs → ...ureHelp/FSharpSignatureHelpTriggerInfo.cs b/...ureHelp/FSharpSignatureHelpTriggerInfo.cs → ...ureHelp/FSharpSignatureHelpTriggerInfo.cs
diff --git a/...eHelp/FSharpSignatureHelpTriggerReason.cs → ...eHelp/FSharpSignatureHelpTriggerReason.cs b/...eHelp/FSharpSignatureHelpTriggerReason.cs → ...eHelp/FSharpSignatureHelpTriggerReason.cs
diff --git a/...atureHelp/IFSharpSignatureHelpProvider.cs → ...atureHelp/IFSharpSignatureHelpProvider.cs b/...atureHelp/IFSharpSignatureHelpProvider.cs → ...atureHelp/IFSharpSignatureHelpProvider.cs
diff --git a/...ccess/FSharp/Structure/FSharpBlockSpan.cs → ...ccess/FSharp/Structure/FSharpBlockSpan.cs b/...ccess/FSharp/Structure/FSharpBlockSpan.cs → ...ccess/FSharp/Structure/FSharpBlockSpan.cs
diff --git a/.../FSharp/Structure/FSharpBlockStructure.cs → .../FSharp/Structure/FSharpBlockStructure.cs b/.../FSharp/Structure/FSharpBlockStructure.cs → .../FSharp/Structure/FSharpBlockStructure.cs
diff --git a/...cess/FSharp/Structure/FSharpBlockTypes.cs → ...cess/FSharp/Structure/FSharpBlockTypes.cs b/...cess/FSharp/Structure/FSharpBlockTypes.cs → ...cess/FSharp/Structure/FSharpBlockTypes.cs
diff --git a/...Structure/IFSharpBlockStructureService.cs → ...Structure/IFSharpBlockStructureService.cs b/...Structure/IFSharpBlockStructureService.cs → ...Structure/IFSharpBlockStructureService.cs
diff --git a/...harp/TaskList/FSharpTaskListDescriptor.cs → ...harp/TaskList/FSharpTaskListDescriptor.cs b/...harp/TaskList/FSharpTaskListDescriptor.cs → ...harp/TaskList/FSharpTaskListDescriptor.cs
diff --git a/...ess/FSharp/TaskList/FSharpTaskListItem.cs → ...ess/FSharp/TaskList/FSharpTaskListItem.cs b/...ess/FSharp/TaskList/FSharpTaskListItem.cs → ...ess/FSharp/TaskList/FSharpTaskListItem.cs
diff --git a/.../FSharp/TaskList/FSharpTaskListService.cs → .../FSharp/TaskList/FSharpTaskListService.cs b/.../FSharp/TaskList/FSharpTaskListService.cs → .../FSharp/TaskList/FSharpTaskListService.cs
diff --git a/...FSharp/TaskList/IFSharpTaskListService.cs → ...FSharp/TaskList/IFSharpTaskListService.cs b/...FSharp/TaskList/IFSharpTaskListService.cs → ...FSharp/TaskList/IFSharpTaskListService.cs
diff --git a/.../IFSharpWorkspaceProjectContextFactory.cs → .../IFSharpWorkspaceProjectContextFactory.cs b/.../IFSharpWorkspaceProjectContextFactory.cs → .../IFSharpWorkspaceProjectContextFactory.cs
diff --git a/.../xlf/ExternalAccessFSharpResources.cs.xlf → .../xlf/ExternalAccessFSharpResources.cs.xlf b/.../xlf/ExternalAccessFSharpResources.cs.xlf → .../xlf/ExternalAccessFSharpResources.cs.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.de.xlf → .../xlf/ExternalAccessFSharpResources.de.xlf b/.../xlf/ExternalAccessFSharpResources.de.xlf → .../xlf/ExternalAccessFSharpResources.de.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.es.xlf → .../xlf/ExternalAccessFSharpResources.es.xlf b/.../xlf/ExternalAccessFSharpResources.es.xlf → .../xlf/ExternalAccessFSharpResources.es.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.fr.xlf → .../xlf/ExternalAccessFSharpResources.fr.xlf b/.../xlf/ExternalAccessFSharpResources.fr.xlf → .../xlf/ExternalAccessFSharpResources.fr.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.it.xlf → .../xlf/ExternalAccessFSharpResources.it.xlf b/.../xlf/ExternalAccessFSharpResources.it.xlf → .../xlf/ExternalAccessFSharpResources.it.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.ja.xlf → .../xlf/ExternalAccessFSharpResources.ja.xlf b/.../xlf/ExternalAccessFSharpResources.ja.xlf → .../xlf/ExternalAccessFSharpResources.ja.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.ko.xlf → .../xlf/ExternalAccessFSharpResources.ko.xlf b/.../xlf/ExternalAccessFSharpResources.ko.xlf → .../xlf/ExternalAccessFSharpResources.ko.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.pl.xlf → .../xlf/ExternalAccessFSharpResources.pl.xlf b/.../xlf/ExternalAccessFSharpResources.pl.xlf → .../xlf/ExternalAccessFSharpResources.pl.xlf
diff --git a/...f/ExternalAccessFSharpResources.pt-BR.xlf → ...f/ExternalAccessFSharpResources.pt-BR.xlf b/...f/ExternalAccessFSharpResources.pt-BR.xlf → ...f/ExternalAccessFSharpResources.pt-BR.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.ru.xlf → .../xlf/ExternalAccessFSharpResources.ru.xlf b/.../xlf/ExternalAccessFSharpResources.ru.xlf → .../xlf/ExternalAccessFSharpResources.ru.xlf
diff --git a/.../xlf/ExternalAccessFSharpResources.tr.xlf → .../xlf/ExternalAccessFSharpResources.tr.xlf b/.../xlf/ExternalAccessFSharpResources.tr.xlf → .../xlf/ExternalAccessFSharpResources.tr.xlf
diff --git a/...ExternalAccessFSharpResources.zh-Hans.xlf → ...ExternalAccessFSharpResources.zh-Hans.xlf b/...ExternalAccessFSharpResources.zh-Hans.xlf → ...ExternalAccessFSharpResources.zh-Hans.xlf
diff --git a/...ExternalAccessFSharpResources.zh-Hant.xlf → ...ExternalAccessFSharpResources.zh-Hant.xlf b/...ExternalAccessFSharpResources.zh-Hant.xlf → ...ExternalAccessFSharpResources.zh-Hant.xlf
diff --git a/...rnalAccess/FSharpTest/FSharpGlyphTests.cs → ...rnalAccess/FSharpTest/FSharpGlyphTests.cs b/...rnalAccess/FSharpTest/FSharpGlyphTests.cs → ...rnalAccess/FSharpTest/FSharpGlyphTests.cs
diff --git a/...SharpTest/FSharpHighlightSpanKindTests.cs → ...SharpTest/FSharpHighlightSpanKindTests.cs b/...SharpTest/FSharpHighlightSpanKindTests.cs → ...SharpTest/FSharpHighlightSpanKindTests.cs
diff --git a/...FSharpInlineRenameReplacementKindTests.cs → ...FSharpInlineRenameReplacementKindTests.cs b/...FSharpInlineRenameReplacementKindTests.cs → ...FSharpInlineRenameReplacementKindTests.cs
diff --git a/...arpTest/FSharpNavigateToMatchKindTests.cs → ...arpTest/FSharpNavigateToMatchKindTests.cs b/...arpTest/FSharpNavigateToMatchKindTests.cs → ...arpTest/FSharpNavigateToMatchKindTests.cs
diff --git a/.../FSharpSignatureHelpTriggerReasonTests.cs → .../FSharpSignatureHelpTriggerReasonTests.cs b/.../FSharpSignatureHelpTriggerReasonTests.cs → .../FSharpSignatureHelpTriggerReasonTests.cs
diff --git a/...is.ExternalAccess.FSharp.UnitTests.csproj → ...is.ExternalAccess.FSharp.UnitTests.csproj b/...is.ExternalAccess.FSharp.UnitTests.csproj → ...is.ExternalAccess.FSharp.UnitTests.csproj
@@ -7,23 +7,11 @@
     <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 	<ItemGroup Label="Project References">
-	  <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-	  <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
 	  <ProjectReference Include="..\..\..\Compilers\Test\Resources\Core\Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj" />
 	  <ProjectReference Include="..\..\..\Compilers\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.vbproj" />
-	  <ProjectReference Include="..\..\..\EditorFeatures\Core.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj" />
-	  <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
-	  <ProjectReference Include="..\..\..\EditorFeatures\CSharp\Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj" />
-	  <ProjectReference Include="..\..\..\EditorFeatures\Text\Microsoft.CodeAnalysis.EditorFeatures.Text.csproj" />
-	  <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-	  <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
-	  <ProjectReference Include="..\..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
 	  <ProjectReference Include="..\..\..\Interactive\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" />
 	  <ProjectReference Include="..\..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" />
 	  <ProjectReference Include="..\..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
-	  <ProjectReference Include="..\..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
-	  <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-	  <ProjectReference Include="..\..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
 	  <ProjectReference Include="..\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj" />
 	</ItemGroup>
   <ItemGroup>

diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -44,37 +44,37 @@
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Apex\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj">
+    <ProjectReference Include="..\ExternalAccess\Apex\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.Apex</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj">
+    <ProjectReference Include="..\..\EditorFeatures\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.Copilot</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj">
+    <ProjectReference Include="..\..\EditorFeatures\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.Debugger</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\EditorConfigGenerator\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj">
+    <ProjectReference Include="..\ExternalAccess\EditorConfigGenerator\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj">
+    <ProjectReference Include="..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.AspNetCore</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj">
+    <ProjectReference Include="..\ExternalAccess\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.FSharp</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>