Skip to content

Commit 1314d09

Browse files
authored
Merge pull request #67145 from dotnet/merges/main-to-release/dev17.6
Snap 17.6 preview 2
2 parents 4e92de3 + 9590007 commit 1314d09

File tree

1,940 files changed

+166079
-104384
lines changed

Some content is hidden

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

1,940 files changed

+166079
-104384
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ src/Features/**/PublicAPI.Unshipped.txt @dotnet/roslyn-api-owners
5151
src/EditorFeatures/**/PublicAPI.Unshipped.txt @dotnet/roslyn-api-owners
5252

5353
src/Tools/ExternalAccess/OmniSharp*/ @333fred @joerobich
54-
src/Tools/ExternalAccess/RazorCompiler @dotnet/roslyn-compiler
54+
src/Tools/ExternalAccess/RazorCompiler*/ @dotnet/roslyn-compiler

Compilers.slnf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"src\\Scripting\\CoreTestUtilities\\Microsoft.CodeAnalysis.Scripting.TestUtilities.csproj",
6161
"src\\Test\\PdbUtilities\\Roslyn.Test.PdbUtilities.csproj",
6262
"src\\Tools\\ExternalAccess\\RazorCompiler\\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj",
63+
"src\\Tools\\ExternalAccess\\RazorCompilerTest\\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.UnitTests.csproj",
6364
"src\\Tools\\PrepareTests\\PrepareTests.csproj",
6465
"src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpSyntaxGenerator\\CSharpSyntaxGenerator.csproj",
6566
"src\\Tools\\Source\\CompilerGeneratorTools\\Source\\BoundTreeGenerator\\CompilersBoundTreeGenerator.csproj",

Roslyn.lutconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<LUTConfig Version="1.0">
2+
<Repository />
3+
<ParallelBuilds>true</ParallelBuilds>
4+
<ParallelTestRuns>true</ParallelTestRuns>
5+
<TestCaseTimeout>180000</TestCaseTimeout>
6+
</LUTConfig>

Roslyn.sln

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDiscoveryWorker", "src\
523523
EndProject
524524
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler", "src\Tools\ExternalAccess\RazorCompiler\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj", "{E5E0BF73-95F7-4BC3-8443-2336C4FF4297}"
525525
EndProject
526+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.UnitTests", "src\Tools\ExternalAccess\RazorCompilerTest\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.UnitTests.csproj", "{828FD0DB-9927-42AC-B6C2-D1514965D6C3}"
527+
EndProject
526528
Global
527529
GlobalSection(SolutionConfigurationPlatforms) = preSolution
528530
Debug|Any CPU = Debug|Any CPU
@@ -629,22 +631,22 @@ Global
629631
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
630632
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
631633
{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Any CPU.Build.0 = Release|Any CPU
632-
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.ActiveCfg = Debug|x64
633-
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.Build.0 = Debug|x64
634-
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.ActiveCfg = Release|x64
635-
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.Build.0 = Release|x64
636-
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.ActiveCfg = Debug|x64
637-
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.Build.0 = Debug|x64
638-
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.ActiveCfg = Release|x64
639-
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.Build.0 = Release|x64
634+
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
635+
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
636+
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
637+
{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.Build.0 = Release|Any CPU
638+
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
639+
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
640+
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
641+
{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.Build.0 = Release|Any CPU
640642
{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
641643
{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
642644
{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
643645
{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Any CPU.Build.0 = Release|Any CPU
644-
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.ActiveCfg = Debug|x64
645-
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.Build.0 = Debug|x64
646-
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.ActiveCfg = Release|x64
647-
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.Build.0 = Release|x64
646+
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
647+
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
648+
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
649+
{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.Build.0 = Release|Any CPU
648650
{C50166F1-BABC-40A9-95EB-8200080CD701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
649651
{C50166F1-BABC-40A9-95EB-8200080CD701}.Debug|Any CPU.Build.0 = Debug|Any CPU
650652
{C50166F1-BABC-40A9-95EB-8200080CD701}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -657,10 +659,10 @@ Global
657659
{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
658660
{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
659661
{E3FDC65F-568D-4E2D-A093-5132FD3793B7}.Release|Any CPU.Build.0 = Release|Any CPU
660-
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.ActiveCfg = Debug|x64
661-
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.Build.0 = Debug|x64
662-
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.ActiveCfg = Release|x64
663-
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.Build.0 = Release|x64
662+
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
663+
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.Build.0 = Debug|Any CPU
664+
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.ActiveCfg = Release|Any CPU
665+
{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.Build.0 = Release|Any CPU
664666
{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
665667
{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Any CPU.Build.0 = Debug|Any CPU
666668
{2E87FA96-50BB-4607-8676-46521599F998}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1277,6 +1279,10 @@ Global
12771279
{E5E0BF73-95F7-4BC3-8443-2336C4FF4297}.Debug|Any CPU.Build.0 = Debug|Any CPU
12781280
{E5E0BF73-95F7-4BC3-8443-2336C4FF4297}.Release|Any CPU.ActiveCfg = Release|Any CPU
12791281
{E5E0BF73-95F7-4BC3-8443-2336C4FF4297}.Release|Any CPU.Build.0 = Release|Any CPU
1282+
{828FD0DB-9927-42AC-B6C2-D1514965D6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1283+
{828FD0DB-9927-42AC-B6C2-D1514965D6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
1284+
{828FD0DB-9927-42AC-B6C2-D1514965D6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
1285+
{828FD0DB-9927-42AC-B6C2-D1514965D6C3}.Release|Any CPU.Build.0 = Release|Any CPU
12801286
EndGlobalSection
12811287
GlobalSection(SolutionProperties) = preSolution
12821288
HideSolutionNode = FALSE
@@ -1515,6 +1521,7 @@ Global
15151521
{8A29449D-411E-49E4-B99E-E8428076BB21} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
15161522
{8BC50AFF-1EBF-4E9A-AEBB-04F387AA800F} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
15171523
{E5E0BF73-95F7-4BC3-8443-2336C4FF4297} = {8977A560-45C2-4EC2-A849-97335B382C74}
1524+
{828FD0DB-9927-42AC-B6C2-D1514965D6C3} = {8977A560-45C2-4EC2-A849-97335B382C74}
15181525
EndGlobalSection
15191526
GlobalSection(ExtensibilityGlobals) = postSolution
15201527
SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}

azure-pipelines-integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ pr:
4343
- CONTRIBUTING.md
4444
- README.md
4545
- src/Compilers/*
46+
- src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/README.md
4647

4748
parameters:
4849
- name: poolName
@@ -55,7 +56,7 @@ parameters:
5556
- name: queueName
5657
displayName: Queue Name
5758
type: string
58-
default: windows.vs2022.scout.amd64.open
59+
default: windows.vs2022.amd64.open
5960
values:
6061
- windows.vs2022.amd64.open
6162
- windows.vs2022.scout.amd64.open

azure-pipelines.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pr:
1919
exclude:
2020
- docs/*
2121
- eng/config/PublishData.json
22+
- src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/README.md
2223
- .vscode/*
2324
- .github/*
2425
- .devcontainer/*
@@ -216,7 +217,11 @@ stages:
216217
demands: ImageOverride -equals windows.vs2022preview.amd64.open
217218
timeoutInMinutes: 90
218219
variables:
219-
compilerChange: $[dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange']]
220+
- template: eng/pipelines/variables-build.yml
221+
parameters:
222+
configuration: Release
223+
- name: compilerChange
224+
value: $[dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange']]
220225
steps:
221226
- template: eng/pipelines/checkout-windows-task.yml
222227

@@ -261,6 +266,10 @@ stages:
261266
name: NetCore-Public
262267
demands: ImageOverride -equals windows.vs2022preview.amd64.open
263268
timeoutInMinutes: 90
269+
variables:
270+
- template: eng/pipelines/variables-build.yml
271+
parameters:
272+
configuration: Debug
264273
steps:
265274
- template: eng/pipelines/checkout-windows-task.yml
266275

@@ -279,6 +288,10 @@ stages:
279288
name: NetCore-Public
280289
demands: ImageOverride -equals windows.vs2022preview.amd64.open
281290
timeoutInMinutes: 90
291+
variables:
292+
- template: eng/pipelines/variables-build.yml
293+
parameters:
294+
configuration: Release
282295
steps:
283296
- template: eng/pipelines/checkout-windows-task.yml
284297

@@ -321,6 +334,10 @@ stages:
321334
name: NetCore-Public
322335
demands: ImageOverride -equals windows.vs2022preview.amd64.open
323336
timeoutInMinutes: 90
337+
variables:
338+
- template: eng/pipelines/variables-build.yml
339+
parameters:
340+
configuration: Release
324341
steps:
325342
- template: eng/pipelines/checkout-windows-task.yml
326343

@@ -346,6 +363,11 @@ stages:
346363
name: NetCore-Public
347364
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
348365
timeoutInMinutes: 35
366+
variables:
367+
- template: eng/pipelines/variables-build.yml
368+
parameters:
369+
configuration: Debug
370+
349371
steps:
350372
- template: eng/pipelines/checkout-unix-task.yml
351373

docs/Language Feature Status.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ efforts behind them.
1616
| [nameof accessing instance members](https://github.com/dotnet/roslyn/issues/40229) | main | [In Progress](https://github.com/dotnet/roslyn/pull/48754) | [YairHalberstadt ](https://github.com/YairHalberstadt) | [333fred](https://github.com/333fred), [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred) |
1717
| [Lambda default parameters](https://github.com/dotnet/csharplang/issues/6051) | [lambda-default-parameters](https://github.com/dotnet/roslyn/tree/features/lambda-default-parameters) | [Merged into 17.5p2](https://github.com/dotnet/roslyn/issues/62485) | [adamperlin](https://github.com/adamperlin), [jjonescz](https://github.com/jjonescz) | [333fred](https://github.com/333fred), [cston](https://github.com/cston) | [captainsafia](https://github.com/captainsafia) |
1818
| [Default in deconstruction](https://github.com/dotnet/roslyn/pull/25562) | [decon-default](https://github.com/dotnet/roslyn/tree/features/decon-default) | [In Progress](https://github.com/dotnet/roslyn/issues/25559) | [jcouv](https://github.com/jcouv) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) |
19-
| [Collection Literals](https://github.com/dotnet/csharplang/issues/5354) | [CollectionLiterals](https://github.com/dotnet/roslyn/tree/features/CollectionLiterals) | | [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [RikkiGibson](https://github.com/RikkiGibson) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
19+
| [Collection Literals](https://github.com/dotnet/csharplang/issues/5354) | [CollectionLiterals](https://github.com/dotnet/roslyn/tree/features/CollectionLiterals) | [In Progress](https://github.com/dotnet/roslyn/issues/66418) | [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [RikkiGibson](https://github.com/RikkiGibson) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
20+
| [Roles/Extensions](https://github.com/dotnet/csharplang/issues/5497) | [roles](https://github.com/dotnet/roslyn/tree/features/roles) | [In Progress](https://github.com/dotnet/roslyn/issues/66722) | [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs), [333fred](https://github.com/333fred) | [MadsTorgersen](https://github.com/MadsTorgersen) |
2021

2122
# C# 11.0
2223

docs/features/incremental-generators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Summary
44

55
Incremental generators are a new API that exists alongside
6-
[source generators](generators.md) to allow users to specify generation
6+
[source generators](source-generators.md) to allow users to specify generation
77
strategies that can be applied in a high performance way by the hosting layer.
88

99
### High Level Design Goals

docs/features/source-generators.cookbook.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
## Summary
44

5-
> **Note**: The design for the source generator proposal is still under review. This document uses only one possible syntax, and
6-
> it is expected to change without notice as the feature evolves.
5+
> **Warning**: Source generators implementing `ISourceGenerator` have been deprecated
6+
> in favor of [incremental generators](incremental-generators.md).
7+
> This document has not been fully updated to reflect that.
8+
> You should implement `IIncrementalGenerator` instead of `ISourceGenerator`.
79
810
This document aims to be a guide to help the creation of source generators by providing a series of guidelines for common patterns.
911
It also aims to set out what types of generators are possible under the current design, and what is expected to be explicitly out

docs/features/source-generators.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Source Generators
22

3-
43
## Summary
54

5+
> **Warning**: Source generators implementing `ISourceGenerator` have been deprecated
6+
> in favor of [incremental generators](incremental-generators.md).
7+
68
Source generators aim to enable _compile time metaprogramming_, that is, code that can be created
79
at compile time and added to the compilation. Source generators will be able to read the contents of
810
the compilation before running, as well as access any _additional files_, enabling generators to

0 commit comments

Comments
 (0)