Skip to content

Commit b3d5e63

Browse files
committed
Merge remote-tracking branch 'dotnet/main' into value-builder
2 parents b3e8dff + b2a0a98 commit b3d5e63

File tree

14,158 files changed

+1863272
-1165169
lines changed

Some content is hidden

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

14,158 files changed

+1863272
-1165169
lines changed

.devcontainer/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
22

3-
# [Choice] .NET version: 6.0, 5.0, 3.1, 2.1
4-
ARG VARIANT="6.0"
5-
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
3+
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:8.0
64

75
# Set up machine requirements to build the repo
86
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

+50-47
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,59 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/dotnetcore
33
{
4-
"name": "C# (.NET 6)",
4+
"name": "C# (.NET 8)",
55
"build": {
66
"dockerfile": "Dockerfile",
7-
"args": {
8-
"VARIANT": "6.0",
9-
}
107
},
11-
"settings": {
12-
"files.associations": {
13-
"*.csproj": "msbuild",
14-
"*.fsproj": "msbuild",
15-
"*.globalconfig": "ini",
16-
"*.manifest": "xml",
17-
"*.nuspec": "xml",
18-
"*.pkgdef": "ini",
19-
"*.projitems": "msbuild",
20-
"*.props": "msbuild",
21-
"*.resx": "xml",
22-
"*.rsp": "Powershell",
23-
"*.ruleset": "xml",
24-
"*.settings": "xml",
25-
"*.shproj": "msbuild",
26-
"*.slnf": "json",
27-
"*.targets": "msbuild",
28-
"*.vbproj": "msbuild",
29-
"*.vsixmanifest": "xml",
30-
"*.vstemplate": "xml",
31-
"*.xlf": "xml",
32-
"*.yml": "azure-pipelines"
33-
},
34-
// ms-dotnettools.csharp settings
35-
"omnisharp.defaultLaunchSolution": "Compilers.sln",
36-
"omnisharp.disableMSBuildDiagnosticWarning": true,
37-
"omnisharp.enableEditorConfigSupport": true,
38-
"omnisharp.enableImportCompletion": true,
39-
"omnisharp.useModernNet": true,
40-
"omnisharp.enableAsyncCompletion": true,
41-
// ms-vscode.powershell settings
42-
"powershell.promptToUpdatePowerShell": false,
43-
"powershell.integratedConsole.showOnStartup": false,
44-
"powershell.startAutomatically": false,
45-
// ms-azure-devops.azure-pipelines settings
46-
"azure-pipelines.customSchemaFile": ".vscode/dnceng-schema.json"
8+
"customizations": {
9+
"vscode": {
10+
"settings": {
11+
"files.associations": {
12+
"*.csproj": "msbuild",
13+
"*.fsproj": "msbuild",
14+
"*.globalconfig": "ini",
15+
"*.manifest": "xml",
16+
"*.nuspec": "xml",
17+
"*.pkgdef": "ini",
18+
"*.projitems": "msbuild",
19+
"*.props": "msbuild",
20+
"*.resx": "xml",
21+
"*.rsp": "Powershell",
22+
"*.ruleset": "xml",
23+
"*.settings": "xml",
24+
"*.shproj": "msbuild",
25+
"*.slnf": "json",
26+
"*.targets": "msbuild",
27+
"*.vbproj": "msbuild",
28+
"*.vsixmanifest": "xml",
29+
"*.vstemplate": "xml",
30+
"*.xlf": "xml",
31+
"*.yml": "azure-pipelines"
32+
},
33+
// ms-dotnettools.csharp settings
34+
"omnisharp.disableMSBuildDiagnosticWarning": true,
35+
"omnisharp.enableEditorConfigSupport": true,
36+
"omnisharp.enableImportCompletion": true,
37+
"omnisharp.useModernNet": true,
38+
"omnisharp.enableAsyncCompletion": true,
39+
// ms-dotnettools.csdevkit settings
40+
"dotnet.defaultSolution": "Roslyn.sln",
41+
// ms-vscode.powershell settings
42+
"powershell.promptToUpdatePowerShell": false,
43+
"powershell.integratedConsole.showOnStartup": false,
44+
"powershell.startAutomatically": false,
45+
// ms-azure-devops.azure-pipelines settings
46+
"azure-pipelines.customSchemaFile": ".vscode/dnceng-schema.json"
47+
},
48+
"extensions": [
49+
"ms-dotnettools.csharp",
50+
"ms-dotnettools.csdevkit",
51+
"EditorConfig.EditorConfig",
52+
"ms-vscode.powershell",
53+
"tintoy.msbuild-project-tools",
54+
"ms-azure-devops.azure-pipelines"
55+
]
56+
}
4757
},
48-
"extensions": [
49-
"ms-dotnettools.csharp",
50-
"EditorConfig.EditorConfig",
51-
"ms-vscode.powershell",
52-
"tintoy.msbuild-project-tools",
53-
"ms-azure-devops.azure-pipelines"
54-
],
5558
"postCreateCommand": "${containerWorkspaceFolder}/restore.sh"
5659
}

.editorconfig

+21-36
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ root = true
77
[*]
88
indent_style = space
99
# (Please don't specify an indent_size here; that has too many unintended consequences.)
10+
spelling_exclusion_path = SpellingExclusions.dic
1011

1112
# Code files
1213
[*.{cs,csx,vb,vbx}]
@@ -38,9 +39,6 @@ indent_size = 2
3839
# Dotnet code style settings:
3940
[*.{cs,vb}]
4041

41-
# IDE0055: Fix formatting
42-
dotnet_diagnostic.IDE0055.severity = warning
43-
4442
# Sort using and Import directives with System.* appearing first
4543
dotnet_sort_system_directives_first = true
4644
dotnet_separate_import_directive_groups = false
@@ -144,35 +142,15 @@ dotnet_naming_symbols.all_members.applicable_kinds = *
144142

145143
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
146144

147-
# error RS2008: Enable analyzer release tracking for the analyzer project containing rule '{0}'
148-
dotnet_diagnostic.RS2008.severity = none
149-
150-
# IDE0073: File header
151-
dotnet_diagnostic.IDE0073.severity = warning
152145
file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information.
153146

154-
# IDE0035: Remove unreachable code
155-
dotnet_diagnostic.IDE0035.severity = warning
156-
157-
# IDE0036: Order modifiers
158-
dotnet_diagnostic.IDE0036.severity = warning
159-
160-
# IDE0043: Format string contains invalid placeholder
161-
dotnet_diagnostic.IDE0043.severity = warning
162-
163-
# IDE0044: Make field readonly
164-
dotnet_diagnostic.IDE0044.severity = warning
165-
166-
# CONSIDER: Are IDE0051 and IDE0052 too noisy to be warnings for IDE editing scenarios? Should they be made build-only warnings?
167-
# IDE0051: Remove unused private member
168-
dotnet_diagnostic.IDE0051.severity = warning
169-
170-
# IDE0170: Prefer extended property pattern
171-
dotnet_diagnostic.IDE0170.severity = warning
172-
173147
# RS0016: Only enable if API files are present
174148
dotnet_public_api_analyzer.require_api_files = true
175149

150+
# IDE0055: Fix formatting
151+
# Workaround for https://github.com/dotnet/roslyn/issues/70570
152+
dotnet_diagnostic.IDE0055.severity = warning
153+
176154
# CSharp code style settings:
177155
[*.cs]
178156
# Newline settings
@@ -196,6 +174,8 @@ csharp_indent_labels = flush_left
196174
csharp_style_allow_embedded_statements_on_same_line_experimental = false
197175
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
198176
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
177+
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false
178+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false
199179

200180
# Prefer "var" everywhere
201181
csharp_style_var_for_built_in_types = true:suggestion
@@ -249,6 +229,14 @@ csharp_prefer_braces = true:silent
249229
csharp_preserve_single_line_blocks = true
250230
csharp_preserve_single_line_statements = true
251231

232+
# IDE0060: Remove unused parameter
233+
dotnet_diagnostic.IDE0060.severity = warning
234+
235+
[src/{Compilers,ExpressionEvaluator,Scripting}/**Test**/*.{cs,vb}]
236+
237+
# IDE0060: Remove unused parameter
238+
dotnet_diagnostic.IDE0060.severity = none
239+
252240
[src/{Analyzers,CodeStyle,Features,Workspaces,EditorFeatures,VisualStudio}/**/*.{cs,vb}]
253241

254242
# IDE0011: Add braces
@@ -265,9 +253,6 @@ dotnet_diagnostic.IDE0052.severity = warning
265253
# IDE0059: Unnecessary assignment to a value
266254
dotnet_diagnostic.IDE0059.severity = warning
267255

268-
# IDE0060: Remove unused parameter
269-
dotnet_diagnostic.IDE0060.severity = warning
270-
271256
# CA1012: Abstract types should not have public constructors
272257
dotnet_diagnostic.CA1012.severity = warning
273258

@@ -280,21 +265,21 @@ csharp_style_var_for_built_in_types = true:warning
280265
csharp_style_var_when_type_is_apparent = true:warning
281266
csharp_style_var_elsewhere = true:warning
282267

283-
# dotnet_style_allow_multiple_blank_lines_experimental
284-
dotnet_diagnostic.IDE2000.severity = warning
285-
286268
# csharp_style_allow_embedded_statements_on_same_line_experimental
287269
dotnet_diagnostic.IDE2001.severity = warning
288270

289271
# csharp_style_allow_blank_lines_between_consecutive_braces_experimental
290272
dotnet_diagnostic.IDE2002.severity = warning
291273

292-
# dotnet_style_allow_statement_immediately_after_block_experimental
293-
dotnet_diagnostic.IDE2003.severity = warning
294-
295274
# csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental
296275
dotnet_diagnostic.IDE2004.severity = warning
297276

277+
# csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental
278+
dotnet_diagnostic.IDE2005.severity = warning
279+
280+
# csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental
281+
dotnet_diagnostic.IDE2006.severity = warning
282+
298283
[src/{VisualStudio}/**/*.{cs,vb}]
299284
# CA1822: Make member static
300285
# There is a risk of accidentally breaking an internal API that partners rely on though IVT.

.git-blame-ignore-revs

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
# dotnet-format -w Roslyn.sln on June 18, 2021
22
abce41d282ac631be5217140f1bd46d0e250ad02
33
fbdb56063e761643707f6bc1e1ba469f6fb9a31a
4-
57278e7dcbf7bffb310e8b14105f657f0fdbab78
4+
57278e7dcbf7bffb310e8b14105f657f0fdbab78
5+
# Converting to file scoped namespaces on 2/27/2024. https://github.com/dotnet/roslyn/pull/72294
6+
ec6c8b40e23a595b1e75aec920e3fb29e55f61cf
7+
de42965cf9b64d71bccc549dd9940210cda5abf1
8+
4262648cadff59cc703b6be8c00b9814a6b13c5a
9+
17e64d5773140ae5813664932bbfa4722a983805
10+
3f632c70e8e28a5ede881784600d0f3d06d3138d
11+
27b50978f636ac0588ea7c19664fac4502e964a7
12+
f125c2664d3bffb59536f4d3dfee7fa5323c7721

.github/CODEOWNERS

+14-10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ docs/compilers @dotnet/roslyn-compiler
88
docs/ide @dotnet/roslyn-ide
99

1010
eng/ @dotnet/roslyn-infrastructure
11+
eng/SourceBuild* @dotnet/source-build-internal
1112
scripts/ @dotnet/roslyn-infrastructure
1213

1314
src/Analyzers/ @dotnet/roslyn-ide
@@ -18,27 +19,30 @@ src/Compilers/ @dotnet/roslyn-compiler
1819
# to happen.
1920
src/Compilers/Test/Core/Traits/Traits.cs
2021
src/EditorFeatures/ @dotnet/roslyn-ide
21-
22-
# If we touch the WPF layer or Cocoa layers, the VS for Mac team also should take a look. We do this even if it's
23-
# only touching WPF since the change might also need to be made (and validated) on the Cocoa side of things.
24-
src/EditorFeatures/Core.Cocoa/ @dotnet/roslyn-ide @dotnet/roslyn-vs-for-mac
25-
src/EditorFeatures/Core.Wpf/ @dotnet/roslyn-ide @dotnet/roslyn-vs-for-mac
26-
src/EditorFeatures/CSharp.Wpf/ @dotnet/roslyn-ide @dotnet/roslyn-vs-for-mac
27-
2822
src/Features/ @dotnet/roslyn-ide
2923
src/Interactive/ @dotnet/roslyn-interactive
3024
src/NuGet/ @dotnet/roslyn-infrastructure
3125
src/Scripting/ @dotnet/roslyn-interactive
3226
src/Setup/ @dotnet/roslyn-infrastructure
33-
src/Tools/ @dotnet/roslyn-infrastructure
27+
src/Tools/AnalyzerRunner @dotnet/roslyn-ide
28+
src/Tools/BuildActionTelemetryTable @dotnet/roslyn-infrastructure
29+
src/Tools/BuildBoss @dotnet/roslyn-infrastructure
30+
src/Tools/BuildValidator @dotnet/roslyn-infrastructure
31+
src/Tools/dotnet-format @dotnet/roslyn-infrastructure
32+
src/Tools/ExternalAccess @dotnet/roslyn-ide
33+
src/Tools/IdeBenchmarks @dotnet/roslyn-ide
34+
src/Tools/IdeCoreBenchmarks @dotnet/roslyn-ide
35+
src/Tools/ManifestGenerator @dotnet/roslyn-infrastructure
36+
src/Tools/PrepareTests @dotnet/roslyn-infrastructure
3437
src/Tools/Source/CompilerGeneratorTools/ @dotnet/roslyn-compiler
38+
src/Tools/Source/RunTests @dotnet/roslyn-infrastructure
3539
src/VisualStudio/ @dotnet/roslyn-ide
36-
src/VisualStudio/LiveShare @dotnet/roslyn-ide @daytonellwanger @srivatsn @aletsdelarosa
3740
src/Workspaces/ @dotnet/roslyn-ide
3841

3942
src/Compilers/**/PublicAPI.Unshipped.txt @dotnet/roslyn-api-owners
4043
src/Workspaces/**/PublicAPI.Unshipped.txt @dotnet/roslyn-api-owners
4144
src/Features/**/PublicAPI.Unshipped.txt @dotnet/roslyn-api-owners
4245
src/EditorFeatures/**/PublicAPI.Unshipped.txt @dotnet/roslyn-api-owners
4346

44-
src/Tools/ExternalAccess/OmniSharp*/ @333fred @joerobich
47+
src/Tools/ExternalAccess/OmniSharp*/ @333fred @dibarbet
48+
src/Tools/ExternalAccess/CompilerDeveloperSDK/ @333fred

.github/ISSUE_TEMPLATE/bug-report.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ about: Report a bug in Roslyn
1111
2.
1212
3.
1313

14-
(A [sharplab](https://sharplab.io/) repro is ideal for compiler/language issues whenever possible)
14+
A minimal repro, with source-code provided, is ideal. Using [sharplab](https://sharplab.io/) is preferred for compiler/language issues whenever possible.
15+
16+
**Diagnostic Id**:
17+
18+
If this is a report about a bug in an analyzer, please include the diagnostic if possible (e.g. `"IDE0030"`).
1519

1620
**Expected Behavior**:
1721

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
name: Localization suggestion
3+
about: Suggest a change to a localized string.
4+
labels: [Area-Infrastructure, Tenet-Localization]
5+
---
6+
7+
## Repo URL where the string lives
8+
9+
https://github.com/dotnet/roslyn
10+
11+
## File Name
12+
13+
<!-- A github link to the .xlf file or files with the problematic translation. -->
14+
15+
## Resource ID
16+
17+
<!-- The ResourceID from `<trans-unit id="{ResourceID}">`. -->
18+
19+
## English String
20+
21+
<!-- The EnglishString from `<source>{EnglishString}</source>`. -->
22+
23+
## Current Translation
24+
25+
<!-- The CurrentTranslation from `<target state="translated">{CurrentTranslation}</target>`. -->
26+
27+
## Suggested Translation
28+
29+
<!-- The suggested translation. -->
30+
31+
## Language
32+
33+
<!-- The language of the problematic translation. -->
34+
35+
## Why Fix is needed
36+
37+
<!-- A brief explanation of why the current translation is not appropriate. -->
38+
39+
40+
41+
<!-- Do not make changes below this line. -->
42+
---
43+
## Roslyn Team Instructions
44+
45+
A Roslyn team member will file a bug through https://aka.ms/ceLocBug which the translation team will consider.
46+
47+
Internal Tracking Issue: {Update with tracking issue URL.}

0 commit comments

Comments
 (0)