Skip to content

Commit b1e2e4b

Browse files
committed
Backport #125488: Add curl retry flags to wasi-sdk Linux download
Backport of #125488 to release/10.0. On release/10.0, the wasi-sdk curl download is in src/mono/mono.proj (not eng/AcquireWasiSdk.targets as on main). Add --silent --show-error --fail --retry 3 --retry-delay 5 flags to prevent transient download failures from breaking the build.
2 parents 7c1d564 + 247ae44 commit b1e2e4b

17,624 files changed

Lines changed: 4816957 additions & 543743 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: 1 addition & 18 deletions
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/coreai/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
2+
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
33
# (Access restricted to Microsoft employees only.)
44

55
path_classifiers:
@@ -8,26 +8,9 @@ path_classifiers:
88
# be excluded from analysis. If there is a problem at the API layer, the analysis
99
# engine will detect the problem in the src/ implementations anyway.
1010
- src/libraries/**/ref/*
11-
cmake_internal:
1211
# exclude artifacts/obj/**/CMakeFiles/**/CheckFunctionExists.c since CMake
1312
# generates random directory names causing creation of duplicate issues
1413
# related to obsolete encryption algorithm used. Note that CheckFuntionExists
1514
# files are generated as part of build-time checks in CMake and are not compiled
1615
# or linked into any product binaries.
1716
- 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"

.azuredevops/dependabot.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.config/CredScanSuppressions.json

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
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-
"src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs"
12-
],
13-
"placeholder": [
14-
"-----BEGIN PRIVATE KEY-----",
15-
"-----BEGIN * PRIVATE KEY-----"
16-
]
17-
}
18-
]
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/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.key"
12+
],
13+
"placeholder": [
14+
"-----BEGIN PRIVATE KEY-----",
15+
"-----BEGIN * PRIVATE KEY-----"
16+
]
17+
},
18+
{
19+
"_justification": "Suppression approved. Private key for testing purpose.",
20+
"file": [
21+
"src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.pfx"
22+
]
23+
}
24+
]
1925
}

.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": "11.0.0-prerelease.26160.2",
18+
"version": "11.0.0-prerelease.26117.1",
1919
"commands": [
2020
"xharness"
2121
]

.devcontainer/android/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"vscode": {
3030
// Add the IDs of extensions you want installed when the container is created.
3131
"extensions": [
32-
"ms-dotnettools.csharp",
33-
"ms-dotnettools.csdevkit"
32+
"ms-dotnettools.csharp"
3433
],
3534
"settings": {
3635
// Loading projects on demand is better for larger codebases
@@ -55,7 +54,8 @@
5554
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
5655
// Add the Android SDK tooling and emulator to the path.
5756
"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}"
57+
"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}",
58+
"DOTNET_MULTILEVEL_LOOKUP": "0"
5959
},
6060

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

.devcontainer/devcontainer.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@
99
},
1010
"hostRequirements": {
1111
"cpus": 4,
12-
"memory": "8gb",
13-
"storage": "64gb"
12+
"memory": "8gb"
1413
},
1514

1615
"features": {
17-
"ghcr.io/devcontainers/features/github-cli:1": {},
18-
"ghcr.io/devcontainers/features/sshd:1": {},
19-
"ghcr.io/devcontainers/features/copilot-cli:1": {}
16+
"ghcr.io/devcontainers/features/github-cli:1": {}
2017
},
2118

2219
// Configure tool-specific properties.
@@ -25,8 +22,7 @@
2522
"vscode": {
2623
// Add the IDs of extensions you want installed when the container is created.
2724
"extensions": [
28-
"ms-dotnettools.csharp",
29-
"ms-dotnettools.csdevkit"
25+
"ms-dotnettools.csharp"
3026
],
3127
"settings": {
3228
// Loading projects on demand is better for larger codebases
@@ -42,7 +38,8 @@
4238
// Add the locally installed dotnet to the path to ensure that it is activated
4339
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4440
"remoteEnv": {
45-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
41+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
42+
"DOTNET_MULTILEVEL_LOOKUP": "0"
4643
},
4744

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

.devcontainer/libraries/devcontainer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
},
1010
"hostRequirements": {
1111
"cpus": 4,
12-
"memory": "8gb",
13-
"storage": "64gb"
12+
"memory": "8gb"
1413
},
1514

1615
"features": {
@@ -23,8 +22,7 @@
2322
"vscode": {
2423
// Add the IDs of extensions you want installed when the container is created.
2524
"extensions": [
26-
"ms-dotnettools.csharp",
27-
"ms-dotnettools.csdevkit"
25+
"ms-dotnettools.csharp"
2826
],
2927
"settings": {
3028
// Loading projects on demand is better for larger codebases
@@ -46,7 +44,8 @@
4644
// Add the locally installed dotnet to the path to ensure that it is activated
4745
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4846
"remoteEnv": {
49-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
47+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
48+
"DOTNET_MULTILEVEL_LOOKUP": "0"
5049
},
5150

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

.devcontainer/wasm-multiThreaded/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"vscode": {
2424
// Add the IDs of extensions you want installed when the container is created.
2525
"extensions": [
26-
"ms-dotnettools.csharp",
27-
"ms-dotnettools.csdevkit"
26+
"ms-dotnettools.csharp"
2827
],
2928
"settings": {
3029
// Loading projects on demand is better for larger codebases
@@ -47,7 +46,8 @@
4746
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4847
// Add the global tools dir to the PATH so that globally installed tools will work
4948
"remoteEnv": {
50-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}"
49+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
50+
"DOTNET_MULTILEVEL_LOOKUP": "0",
5151
},
5252

5353
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
@@ -57,7 +57,7 @@
5757
"forwardPorts": [8000],
5858
"portsAttributes": {
5959
"8000": {
60-
"label": "mono wasm samples (8000)"
60+
"label": "mono wasm samples (8000)",
6161
}
6262
}
6363
}

.devcontainer/wasm/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"vscode": {
2424
// Add the IDs of extensions you want installed when the container is created.
2525
"extensions": [
26-
"ms-dotnettools.csharp",
27-
"ms-dotnettools.csdevkit"
26+
"ms-dotnettools.csharp"
2827
],
2928
"settings": {
3029
// Loading projects on demand is better for larger codebases
@@ -47,7 +46,8 @@
4746
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
4847
// Add the global tools dir to the PATH so that globally installed tools will work
4948
"remoteEnv": {
50-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}"
49+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
50+
"DOTNET_MULTILEVEL_LOOKUP": "0",
5151
},
5252

5353
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
@@ -57,7 +57,7 @@
5757
"forwardPorts": [8000],
5858
"portsAttributes": {
5959
"8000": {
60-
"label": "mono wasm samples (8000)"
60+
"label": "mono wasm samples (8000)",
6161
}
6262
}
6363
}

.editorconfig

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ indent_style = space
1212
indent_size = 4
1313
trim_trailing_whitespace = true
1414

15-
# Specify UTF-8 without byte-order mark
16-
[*.{csproj,locproj,nativeproj,proj,resx,slnx,vbproj}]
17-
charset = utf-8
18-
1915
# Generated code
2016
[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
2117
generated_code = true
@@ -99,7 +95,7 @@ dotnet_style_collection_initializer = true:suggestion
9995
dotnet_style_prefer_collection_expression = when_types_exactly_match
10096
dotnet_style_explicit_tuple_names = true:suggestion
10197
dotnet_style_coalesce_expression = true:suggestion
102-
dotnet_style_null_propagation = true
98+
dotnet_style_null_propagation = true:suggestion
10399
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
104100
dotnet_style_prefer_inferred_tuple_names = true:suggestion
105101
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
@@ -132,12 +128,6 @@ csharp_style_prefer_index_operator = false:none
132128
csharp_style_prefer_range_operator = false:none
133129
csharp_style_pattern_local_over_anonymous_function = false:none
134130

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-
141131
# Space preferences
142132
csharp_space_after_cast = false
143133
csharp_space_after_colon_in_inheritance_clause = true
@@ -146,7 +136,7 @@ csharp_space_after_dot = false
146136
csharp_space_after_keywords_in_control_flow_statements = true
147137
csharp_space_after_semicolon_in_for_statement = true
148138
csharp_space_around_binary_operators = before_and_after
149-
csharp_space_around_declaration_statements = false
139+
csharp_space_around_declaration_statements = do_not_ignore
150140
csharp_space_before_colon_in_inheritance_clause = true
151141
csharp_space_before_comma = false
152142
csharp_space_before_dot = false
@@ -165,10 +155,6 @@ csharp_space_between_square_brackets = false
165155
# License header
166156
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.
167157

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-
172158
[src/libraries/System.Net.Http/src/System/Net/Http/{SocketsHttpHandler/Http3RequestStream.cs,BrowserHttpHandler/BrowserHttpHandler.cs}]
173159
# disable CA2025, the analyzer throws a NullReferenceException when processing this file: https://github.com/dotnet/roslyn-analyzers/issues/7652
174160
dotnet_diagnostic.CA2025.severity = none
@@ -182,26 +168,23 @@ indent_brace_style = Allman
182168
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
183169
indent_size = 2
184170

171+
[*.{csproj,vbproj,proj,nativeproj,locproj}]
172+
charset = utf-8
173+
185174
# Xml build files
186175
[*.builds]
187176
indent_size = 2
188177

189178
# Xml files
190-
[*.{resx,ruleset,slnx,stylecop,xml}]
179+
[*.{xml,stylecop,resx,ruleset}]
191180
indent_size = 2
192181

193-
# Xml resource files
194-
[*.resx]
195-
# match Visual Studio behavior
196-
insert_final_newline = false
197-
trim_trailing_whitespace = false
198-
199182
# Xml config files
200183
[*.{props,targets,config,nuspec}]
201184
indent_size = 2
202185

203-
# Data serialization
204-
[*.{json,yaml,yml}]
186+
# YAML config files
187+
[*.{yml,yaml}]
205188
indent_size = 2
206189

207190
# Shell scripts

0 commit comments

Comments
 (0)