Skip to content

Commit 53a5782

Browse files
pavelsavarapavelsavara
authored
Merge branch 'main' into stop-generate-nodescripts
2 parents 9ab2b6c + 452e9ba commit 53a5782

14,214 files changed

Lines changed: 633192 additions & 4801626 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.

‎.CodeQL.yml‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file configures CodeQL runs and TSA bug autofiling. For more information, see:
2-
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
2+
# https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
33
# (Access restricted to Microsoft employees only.)
44

55
path_classifiers:
@@ -15,3 +15,43 @@ path_classifiers:
1515
# files are generated as part of build-time checks in CMake and are not compiled
1616
# or linked into any product binaries.
1717
- artifacts/obj/**/CMakeFiles/**/CheckFunctionExists.c
18+
19+
queries:
20+
#
21+
# REPO-WIDE RULE EXCLUSIONS
22+
#
23+
- exclude:
24+
queryid:
25+
# [Serializable] doesn't imply that a type is *safe* to [de]serialize; only that it is
26+
# *possible* to do so. The rules below incorrectly assume we're trying to make a safety
27+
# guarantee.
28+
- "cs/dangerous-deserialization-routine"
29+
- "cs/deserialization-of-pointer-type"
30+
# We already have CodeQL + Roslyn rules running to detect usage of dangerous deserialization
31+
# APIs. Those call sites are well-reviewed and don't benefit from extra alerts regarding
32+
# the possibility of loading malicious code.
33+
- "cs/deserialization-unexpected-subtypes"
34+
#
35+
# Don't warn about usage of non-compliant crypto within our own implementations or interop code,
36+
# since the rule would noisily try to warn us about *ourselves*. These exclusions are scoped
37+
# to just the crypto code itself. We still want alerts when consumers of crypto (even within this
38+
# repo) try to use non-compliant primitives; those call sites must be manually inspected
39+
# and suppressed if appropriate.
40+
#
41+
- exclude:
42+
queryid:
43+
- "cs/ecb-encryption"
44+
- "cs/encryption-with-vulnerable-cipher-mode"
45+
- "cs/weak-symmetric-algorithm"
46+
- "cs/obsolete-password-key-derivation"
47+
- "cs/cryptography/unapproved-usage-of-dsa"
48+
- "cs/weak-crypto"
49+
- "cs/weak-hmacs"
50+
- "java/weak-crypto-algorithm-or-hash"
51+
path:
52+
- "src/libraries/Common/src/Interop/Windows/BCrypt/**"
53+
- "src/libraries/Common/src/System/Security/Cryptography/**"
54+
- "src/libraries/Microsoft.Bcl.Cryptography/**"
55+
- "src/libraries/System.Security.Cryptography/**"
56+
- "src/libraries/System.Security.Cryptography.*/**"
57+
- "src/native/libs/System.Security.Cryptography.*/**"

‎.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.26204.1",
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
},
1515

1616
"features": {
17-
"ghcr.io/devcontainers/features/github-cli:1": {}
17+
"ghcr.io/devcontainers/features/github-cli:1": {},
18+
"ghcr.io/devcontainers/features/sshd:1": {},
19+
"ghcr.io/devcontainers/features/copilot-cli:1": {}
1820
},
1921

2022
// Configure tool-specific properties.
@@ -40,8 +42,7 @@
4042
// Add the locally installed dotnet to the path to ensure that it is activated
4143
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4244
"remoteEnv": {
43-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
44-
"DOTNET_MULTILEVEL_LOOKUP": "0"
45+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
4546
},
4647

4748
// 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: 11 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
@@ -159,6 +165,10 @@ csharp_space_between_square_brackets = false
159165
# License header
160166
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.
161167

168+
# xUnit1051: recommends TestContext.Current.CancellationToken (v3 pattern) which
169+
# is not yet adopted; suppress until a full v3 migration is performed.
170+
dotnet_diagnostic.xUnit1051.severity = none
171+
162172
[src/libraries/System.Net.Http/src/System/Net/Http/{SocketsHttpHandler/Http3RequestStream.cs,BrowserHttpHandler/BrowserHttpHandler.cs}]
163173
# disable CA2025, the analyzer throws a NullReferenceException when processing this file: https://github.com/dotnet/roslyn-analyzers/issues/7652
164174
dotnet_diagnostic.CA2025.severity = none

‎.git-blame-ignore-revs‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Licensed to the .NET Foundation under one or more agreements.
2+
# The .NET Foundation licenses this file to you under the MIT license.
3+
4+
# This file is consumed by GitHub by default and the git-blame command
5+
# optionally to make blames ignore uninteresting commits. See docs here:
6+
# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-and-understanding-files#ignore-commits-in-the-blame-view
7+
# To configure git-blame to use this file, run:
8+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
9+
10+
# These are the commits that trim gc.cpp copies to contain only
11+
# the functions relevant to each split file. They should be ignored
12+
# when running git blame.
13+
14+
# region_allocator.cpp
15+
d49754129145a19ad7aa5a69122e58d09375f4ac
16+
17+
# region_free_list.cpp
18+
83fa3f4a0493c9c57f44c7cb6e77bb5dfb05ea91
19+
20+
# finalization.cpp
21+
2ab9d88c8dd2431fc7a09527dd4adb24848a4ece
22+
23+
# interface.cpp
24+
b91cb52f3b3f23cdb45ac7234a7cab974cbed9af
25+
26+
# allocation.cpp
27+
d682279be75df3debe5413c5fed486cfdabc3534
28+
29+
# mark_phase.cpp
30+
6fbf6a2dd6b5c701119368c08276a3ba552b6683
31+
32+
# plan_phase.cpp
33+
1b46271bd978040090987df603c062a715f0af65
34+
35+
# relocate_compact.cpp
36+
35d6f5a8e0323294d7b9ff4bea3c4213a3db2ccb
37+
38+
# sweep.cpp
39+
43fc659bc9145cab1a4a73aae73ac853bc330256
40+
41+
# background.cpp
42+
81e8f3b4f28894173c6cd3a3a76c4e7f856e8a66
43+
44+
# regions_segments.cpp
45+
ba70358a247a319a5e2895fde84b2579172f3d2b
46+
47+
# card_table.cpp
48+
42f56409dc3c7f2443d28230e3e17c50df9d5629
49+
50+
# memory.cpp
51+
7aa69f096ff5b56e3669b0fe344b85b04426a52e
52+
53+
# diagnostics.cpp
54+
7932b9d8847f277d1fdfe0375a71c35c0a6969f3
55+
56+
# dynamic_tuning.cpp
57+
cdc50607148e41906aafb60e2aeb6aa392d1a249
58+
59+
# no_gc.cpp
60+
2f4ec5f3f7ec88320804b5cabfb8fce5088b4dbd
61+
62+
# dynamic_heap_count.cpp
63+
b22c2d115c34e36fa5711caae405e8ee1292d167
64+
65+
# init.cpp
66+
29123fc5becb2b883b9a335392bf8f1fa709b3e9
67+
68+
# collect.cpp
69+
b5a1146dcfd341e93178530625503dd4fdff5126
70+
71+
# gc.cpp - trim to core infrastructure
72+
b3e810d361b0652e4caa9476b88cb66f4ed1eed2
73+
74+
# Prepare: rename gc.cpp to gc_full.cpp
75+
2fdb93ffc36e8c55b713b017e566deae4438938b

0 commit comments

Comments
 (0)