Skip to content

Commit 9da2930

Browse files
[main] Source code updates from dotnet/roslyn (#9319)
[main] Source code updates from dotnet/roslyn
1 parent 070e631 commit 9da2930

81 files changed

Lines changed: 2002 additions & 1822 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/roslyn/.github/instructions/IDE.instructions.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ Roslyn uses a **layered service architecture** built on MEF (Managed Extensibili
1919
- **EditorConfig templates** (`src/VisualStudio/EditorConfig/`): item templates, generation wizard, context-menu command, VSIX projects, and Visual Studio insertion setup
2020
- The setup insertion component is `Templates.Editorconfig.Setup`, but its SWR package identity must remain `Templates.Editorconfig.SolutionFile.Setup` because existing Visual Studio template packages depend on that ID.
2121

22+
### External Access assemblies
23+
24+
Partner APIs that depend on IDE layers are grouped into one ExternalAccess assembly per layer:
25+
26+
- `src/Features/ExternalAccess/Core/`
27+
- `src/EditorFeatures/ExternalAccess/Core/`
28+
- `src/LanguageServer/ExternalAccess/Core/`
29+
- `src/VisualStudio/ExternalAccess/Core/`
30+
31+
Partner-specific source remains organized in subdirectories of those projects. Compatibility assemblies remain for ASP.NET under `src/Features/ExternalAccess/AspNetCore/` and EditorConfigGenerator under `src/VisualStudio/ExternalAccess/EditorConfigGenerator/`; ExternalAccess projects for APIs that are not part of the unified layer assemblies remain separate.
32+
2233
### Service Resolution
2334
```csharp
2435
// Workspace services

‎src/roslyn/Ide.slnf‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"src\\EditorFeatures\\Core\\Microsoft.CodeAnalysis.EditorFeatures.csproj",
8282
"src\\EditorFeatures\\DiagnosticsTestUtilities\\Microsoft.CodeAnalysis.EditorFeatures.DiagnosticsTests.Utilities.csproj",
8383
"src\\EditorFeatures\\ExternalAccess\\Core\\Microsoft.CodeAnalysis.EditorFeatures.ExternalAccess.csproj",
84-
"src\\EditorFeatures\\ExternalAccess\\Debugger\\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj",
8584
"src\\EditorFeatures\\Test2\\Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj",
8685
"src\\EditorFeatures\\TestUtilities2\\Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2.vbproj",
8786
"src\\EditorFeatures\\TestUtilities\\Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj",
@@ -113,7 +112,6 @@
113112
"src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj",
114113
"src\\Features\\DiagnosticsTestUtilities\\Microsoft.CodeAnalysis.Features.DiagnosticsTests.Utilities.csproj",
115114
"src\\Features\\ExternalAccess\\AspNetCore\\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj",
116-
"src\\Features\\ExternalAccess\\Copilot\\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj",
117115
"src\\Features\\ExternalAccess\\Core\\Microsoft.CodeAnalysis.Features.ExternalAccess.csproj",
118116
"src\\Features\\ExternalAccess\\OmniSharp.CSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj",
119117
"src\\Features\\ExternalAccess\\OmniSharpTest\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests.csproj",
@@ -129,10 +127,7 @@
129127
"src\\Interactive\\csi\\csi.csproj",
130128
"src\\Interactive\\vbi\\vbi.vbproj",
131129
"src\\LanguageServer\\ExternalAccess\\CompilerDeveloperSDK\\Microsoft.CodeAnalysis.ExternalAccess.CompilerDeveloperSDK.csproj",
132-
"src\\LanguageServer\\ExternalAccess\\Copilot\\Microsoft.CodeAnalysis.LanguageServer.ExternalAccess.Copilot.csproj",
133130
"src\\LanguageServer\\ExternalAccess\\Core\\Microsoft.CodeAnalysis.LanguageServer.ExternalAccess.csproj",
134-
"src\\LanguageServer\\ExternalAccess\\VisualDiagnostics\\Microsoft.CodeAnalysis.ExternalAccess.VisualDiagnostics.csproj",
135-
"src\\LanguageServer\\ExternalAccess\\Xaml\\Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj",
136131
"src\\LanguageServer\\Microsoft.CodeAnalysis.LanguageServer.ProcessHost.UnitTests\\Microsoft.CodeAnalysis.LanguageServer.ProcessHost.UnitTests.csproj",
137132
"src\\LanguageServer\\Microsoft.CodeAnalysis.LanguageServer.UnitTests\\Microsoft.CodeAnalysis.LanguageServer.UnitTests.csproj",
138133
"src\\LanguageServer\\Microsoft.CodeAnalysis.LanguageServer\\Microsoft.CodeAnalysis.LanguageServer.csproj",
@@ -208,10 +203,7 @@
208203
"src\\VisualStudio\\EditorConfig\\Templates\\Microsoft.VisualStudio.Templates.Editorconfig.csproj",
209204
"src\\VisualStudio\\EditorConfig\\Wizard\\Microsoft.VisualStudio.Templates.Editorconfig.Wizard.csproj",
210205
"src\\VisualStudio\\EditorConfig\\WizardSetup\\Microsoft.VisualStudio.Templates.Editorconfig.Wizard.Setup.csproj",
211-
"src\\VisualStudio\\ExternalAccess\\Apex\\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj",
212206
"src\\VisualStudio\\ExternalAccess\\Core\\Microsoft.VisualStudio.LanguageServices.ExternalAccess.csproj",
213-
"src\\VisualStudio\\ExternalAccess\\Copilot\\Microsoft.VisualStudio.LanguageServices.ExternalAccess.Copilot.csproj",
214-
"src\\VisualStudio\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj",
215207
"src\\VisualStudio\\ExternalAccess\\Test\\Microsoft.VisualStudio.LanguageServices.ExternalAccess.UnitTests.csproj",
216208
"src\\VisualStudio\\IntegrationTest\\New.IntegrationTests\\Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj",
217209
"src\\VisualStudio\\IntegrationTest\\TestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.csproj",

‎src/roslyn/Razor.slnf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj",
1111
"src\\Features\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Features.csproj",
1212
"src\\Features\\ExternalAccess\\AspNetCore\\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj",
13-
"src\\Features\\ExternalAccess\\Copilot\\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj",
1413
"src\\Features\\ExternalAccess\\Extensions\\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj",
1514
"src\\LanguageServer\\Protocol\\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj",
1615
"src\\Razor\\src\\Compiler\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\\test\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.UnitTests.csproj",
@@ -59,7 +58,6 @@
5958
"src\\Tools\\ExternalAccess\\RazorCompiler\\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj",
6059
"src\\Tools\\ExternalAccess\\RazorCompilerTest\\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.UnitTests.csproj",
6160
"src\\VisualStudio\\Core\\Def\\Microsoft.VisualStudio.LanguageServices.csproj",
62-
"src\\VisualStudio\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj",
6361
"src\\VisualStudio\\IntegrationTest\\Harness\\SourceGenerator\\Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator.csproj",
6462
"src\\VisualStudio\\IntegrationTest\\Harness\\XUnit\\Microsoft.VisualStudio.Extensibility.Testing.Xunit.csproj",
6563
"src\\Workspaces\\Core\\Portable\\Microsoft.CodeAnalysis.Workspaces.csproj",

‎src/roslyn/Roslyn.slnx‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
</Folder>
172172
<Folder Name="/EditorFeatures/ExternalAccess/">
173173
<Project Path="src/EditorFeatures/ExternalAccess/Core/Microsoft.CodeAnalysis.EditorFeatures.ExternalAccess.csproj" />
174-
<Project Path="src/EditorFeatures/ExternalAccess/Debugger/Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj" />
175174
</Folder>
176175
<Folder Name="/ExpressionEvaluator/" />
177176
<Folder Name="/ExpressionEvaluator/Core/">
@@ -239,7 +238,6 @@
239238
</Folder>
240239
<Folder Name="/Features/ExternalAccess/">
241240
<Project Path="src/Features/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
242-
<Project Path="src/Features/ExternalAccess/Copilot/Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" />
243241
<Project Path="src/Features/ExternalAccess/Core/Microsoft.CodeAnalysis.Features.ExternalAccess.csproj" />
244242
<Project Path="src/Features/ExternalAccess/Extensions/Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj" />
245243
<Project Path="src/Features/ExternalAccess/HotReload/Microsoft.CodeAnalysis.ExternalAccess.HotReload.csproj" />
@@ -272,10 +270,7 @@
272270
</Folder>
273271
<Folder Name="/LanguageServer/ExternalAccess/">
274272
<Project Path="src/LanguageServer/ExternalAccess/CompilerDeveloperSDK/Microsoft.CodeAnalysis.ExternalAccess.CompilerDeveloperSDK.csproj" />
275-
<Project Path="src/LanguageServer/ExternalAccess/Copilot/Microsoft.CodeAnalysis.LanguageServer.ExternalAccess.Copilot.csproj" />
276273
<Project Path="src/LanguageServer/ExternalAccess/Core/Microsoft.CodeAnalysis.LanguageServer.ExternalAccess.csproj" />
277-
<Project Path="src/LanguageServer/ExternalAccess/VisualDiagnostics/Microsoft.CodeAnalysis.ExternalAccess.VisualDiagnostics.csproj" />
278-
<Project Path="src/LanguageServer/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj" />
279274
</Folder>
280275
<Folder Name="/Roslyn SDK/" />
281276
<Folder Name="/Roslyn SDK/Microsoft.CodeAnalysis.Testing/" />
@@ -472,10 +467,7 @@
472467
<Project Path="src/VisualStudio/EditorConfig/WizardSetup/Microsoft.VisualStudio.Templates.Editorconfig.Wizard.Setup.csproj" />
473468
</Folder>
474469
<Folder Name="/VisualStudio/ExternalAccess/">
475-
<Project Path="src/VisualStudio/ExternalAccess/Apex/Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj" />
476470
<Project Path="src/VisualStudio/ExternalAccess/Core/Microsoft.VisualStudio.LanguageServices.ExternalAccess.csproj" />
477-
<Project Path="src/VisualStudio/ExternalAccess/Copilot/Microsoft.VisualStudio.LanguageServices.ExternalAccess.Copilot.csproj" />
478-
<Project Path="src/VisualStudio/ExternalAccess/FSharp/Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj" />
479471
<Project Path="src/VisualStudio/ExternalAccess/Test/Microsoft.VisualStudio.LanguageServices.ExternalAccess.UnitTests.csproj" />
480472
</Folder>
481473
<Folder Name="/VisualStudio/Insertion/">

‎src/roslyn/eng/Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
types moved into Shell.Framework, and ComponentModelHost 18.9.x type-forwards them there. Older transitive
8383
versions still define those types, which collides with Shell.Framework (CS0433). -->
8484
<PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost" Version="18.9.453" />
85-
<PackageVersion Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" Version="18.0.634-alpha" />
85+
<PackageVersion Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" Version="18.11.6" />
8686
<PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="18.0.52-preview1" />
8787
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk" Version="18.0.52-preview1" />
8888
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="18.0.52-preview1" />

‎src/roslyn/eng/config/PublishData.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,22 @@
6161
"Microsoft.CodeAnalysis.VisualBasic.EditorFeatures": "vssdk",
6262
"Microsoft.VisualStudio.LanguageServices.DevKit": "vs-impl",
6363
"Microsoft.CodeAnalysis.LanguageServer.Protocol": "vs-impl",
64-
"Microsoft.CodeAnalysis.ExternalAccess.Apex": "vs-impl",
65-
"Microsoft.CodeAnalysis.ExternalAccess.Copilot": "vs-impl",
6664
"Microsoft.CodeAnalysis.ExternalAccess.CompilerDeveloperSDK": "vs-impl",
67-
"Microsoft.CodeAnalysis.ExternalAccess.Debugger": "vs-impl",
6865
"Microsoft.CodeAnalysis.EditorFeatures.ExternalAccess": "vs-impl",
6966
"Microsoft.CodeAnalysis.ExternalAccess.Extensions": "vs-impl",
7067
"Microsoft.CodeAnalysis.Features.ExternalAccess": "vs-impl",
71-
"Microsoft.CodeAnalysis.ExternalAccess.FSharp": "vs-impl",
7268
"Microsoft.CodeAnalysis.ExternalAccess.HotReload": "arcade",
7369
"Microsoft.CodeAnalysis.LanguageServer.ExternalAccess": "vs-impl",
7470
"Microsoft.CodeAnalysis.ExternalAccess.OmniSharp": "arcade",
7571
"Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp": "arcade",
7672
"Microsoft.CodeAnalysis.ExternalAccess.AspNetCore": "vs-impl",
7773
"Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler": "vs-impl",
78-
"Microsoft.CodeAnalysis.ExternalAccess.VisualDiagnostics": "vs-impl",
79-
"Microsoft.CodeAnalysis.ExternalAccess.Xaml": "vs-impl",
80-
"Microsoft.CodeAnalysis.LanguageServer.ExternalAccess.Copilot": "vs-impl",
8174
"Microsoft.CodeAnalysis.Remote.ServiceHub": "vs-impl",
8275
"Microsoft.CodeAnalysis.Remote.Workspaces": "vs-impl",
8376
"Microsoft.CodeAnalysis.SemanticSearch.Extensions": "vs-impl",
8477
"Microsoft.CodeAnalysis.SemanticSearch.ReferenceAssemblies": "vs-impl",
8578
"Microsoft.VisualStudio.LanguageServices.LiveShare": "vs-impl",
8679
"Microsoft.VisualStudio.LanguageServices.ExternalAccess": "vs-impl",
87-
"Microsoft.VisualStudio.LanguageServices.ExternalAccess.Copilot": "vs-impl",
8880
"Microsoft.VisualStudio.LanguageServices.Xaml": "vs-impl",
8981
"Microsoft.CommonLanguageServerProtocol.Framework": "vs-impl",
9082
"Microsoft.CodeAnalysis.Analyzers": "arcade",

0 commit comments

Comments
 (0)