Skip to content

Commit c5d0ac1

Browse files
stephentoubstephentoub
authored
Merge branch 'main' into copilot/add-linq-join-return-tuple
2 parents 7f53b70 + 6641d63 commit c5d0ac1

File tree

9,131 files changed

+262191
-4659819
lines changed

Some content is hidden

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

9,131 files changed

+262191
-4659819
lines changed

‎.config/CredScanSuppressions.json‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
2-
"tool": "Credential Scanner",
3-
"suppressions": [
4-
{
5-
"_justification": "Suppression approved. Private key for testing purpose.",
6-
"file": [
7-
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
8-
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
9-
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
10-
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs"
11-
],
12-
"placeholder": [
13-
"-----BEGIN PRIVATE KEY-----",
14-
"-----BEGIN * PRIVATE KEY-----"
15-
]
16-
}
17-
]
2+
"tool": "Credential Scanner",
3+
"suppressions": [
4+
{
5+
"_justification": "Suppression approved. Private key for testing purpose.",
6+
"file": [
7+
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
8+
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
9+
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
10+
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
11+
"src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs"
12+
],
13+
"placeholder": [
14+
"-----BEGIN PRIVATE KEY-----",
15+
"-----BEGIN * PRIVATE KEY-----"
16+
]
17+
}
18+
]
1819
}

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "10.0.0-prerelease.25506.2",
18+
"version": "11.0.0-prerelease.26064.3",
1919
"commands": [
2020
"xharness"
2121
]

‎.devcontainer/android/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
5656
// Add the Android SDK tooling and emulator to the path.
5757
"remoteEnv": {
58-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools/bin:${containerEnv:ANDROID_SDK_ROOT}/emulator:${containerEnv:ANDROID_SDK_ROOT}/platform-tools:${containerEnv:PATH}",
59-
"DOTNET_MULTILEVEL_LOOKUP": "0"
58+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools/bin:${containerEnv:ANDROID_SDK_ROOT}/emulator:${containerEnv:ANDROID_SDK_ROOT}/platform-tools:${containerEnv:PATH}"
6059
},
6160

6261
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
// Add the locally installed dotnet to the path to ensure that it is activated
4141
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4242
"remoteEnv": {
43-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
44-
"DOTNET_MULTILEVEL_LOOKUP": "0"
43+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
4544
},
4645

4746
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.devcontainer/libraries/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
// Add the locally installed dotnet to the path to ensure that it is activated
4747
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4848
"remoteEnv": {
49-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
50-
"DOTNET_MULTILEVEL_LOOKUP": "0"
49+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
5150
},
5251

5352
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

‎.devcontainer/wasm-multiThreaded/devcontainer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4848
// Add the global tools dir to the PATH so that globally installed tools will work
4949
"remoteEnv": {
50-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
51-
"DOTNET_MULTILEVEL_LOOKUP": "0",
50+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}"
5251
},
5352

5453
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
@@ -58,7 +57,7 @@
5857
"forwardPorts": [8000],
5958
"portsAttributes": {
6059
"8000": {
61-
"label": "mono wasm samples (8000)",
60+
"label": "mono wasm samples (8000)"
6261
}
6362
}
6463
}

‎.devcontainer/wasm/devcontainer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4848
// Add the global tools dir to the PATH so that globally installed tools will work
4949
"remoteEnv": {
50-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
51-
"DOTNET_MULTILEVEL_LOOKUP": "0",
50+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}"
5251
},
5352

5453
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
@@ -58,7 +57,7 @@
5857
"forwardPorts": [8000],
5958
"portsAttributes": {
6059
"8000": {
61-
"label": "mono wasm samples (8000)",
60+
"label": "mono wasm samples (8000)"
6261
}
6362
}
6463
}

‎.editorconfig‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ csharp_style_prefer_index_operator = false:none
132132
csharp_style_prefer_range_operator = false:none
133133
csharp_style_pattern_local_over_anonymous_function = false:none
134134

135+
# IDE0071: Simplify interpolation - keep as silent hint since ReadOnlySpan<char>.ToString() is required for netstandard targets
136+
dotnet_diagnostic.IDE0071.severity = silent
137+
138+
# IDE0031: Use null propagation - keep as silent hint to avoid build errors with TreatWarningsAsErrors
139+
dotnet_diagnostic.IDE0031.severity = silent
140+
135141
# Space preferences
136142
csharp_space_after_cast = false
137143
csharp_space_after_colon_in_inheritance_clause = true
@@ -140,7 +146,7 @@ csharp_space_after_dot = false
140146
csharp_space_after_keywords_in_control_flow_statements = true
141147
csharp_space_after_semicolon_in_for_statement = true
142148
csharp_space_around_binary_operators = before_and_after
143-
csharp_space_around_declaration_statements = do_not_ignore
149+
csharp_space_around_declaration_statements = false
144150
csharp_space_before_colon_in_inheritance_clause = true
145151
csharp_space_before_comma = false
146152
csharp_space_before_dot = false

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-
8181
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input.txt text eol=lf
8282
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input-big.txt text eol=lf
8383
src/mono/browser/runtime/dotnet.d.ts text eol=lf
84+
src/native/corehost/browserhost/loader/dotnet.d.ts text eol=lf

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,7 @@
9898
/eng/pipelines/**/*wasm* @akoeplinger
9999

100100
# ILLink codeowners
101-
/src/tools/illink/ @marek-safar
102-
/src/tools/illink/src/analyzer/ @radekdoulik
103-
/src/tools/illink/src/ILLink.Tasks/ @sbomer
104-
/src/tools/illink/src/ILLink.RoslynAnalyzer/ @sbomer
105-
/src/tools/illink/src/linker/ @marek-safar @mrvoorhe
106-
/src/tools/illink/test/ @marek-safar @mrvoorhe
101+
/src/tools/illink/ @sbomer
107102

108103
# Obsoletions / Custom Diagnostics
109104

0 commit comments

Comments
 (0)
⚡