Skip to content

Commit 1a95bcc

Browse files
rzikmrzikm
committed
Merge remote-tracking branch 'upstream/main' into http3-missing-data-hunt
2 parents b6c8de0 + 0d426df commit 1a95bcc

File tree

7,801 files changed

+377297
-154995
lines changed

Some content is hidden

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

7,801 files changed

+377297
-154995
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2-
3-
pipelines:
4-
679:
5-
retail:
6-
binary:
7-
credscan:
8-
lastModifiedDate: 2024-04-11
9-
binskim:
10-
lastModifiedDate: 2024-04-11
11-
spotbugs:
12-
lastModifiedDate: 2024-04-11
13-
source:
14-
credscan:
15-
lastModifiedDate: 2024-04-11
16-
eslint:
17-
lastModifiedDate: 2024-04-11
18-
psscriptanalyzer:
19-
lastModifiedDate: 2024-04-11
20-
armory:
21-
lastModifiedDate: 2024-04-11
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
679:
5+
retail:
6+
binary:
7+
credscan:
8+
lastModifiedDate: 2024-04-11
9+
binskim:
10+
lastModifiedDate: 2024-04-11
11+
spotbugs:
12+
lastModifiedDate: 2024-04-11
13+
source:
14+
credscan:
15+
lastModifiedDate: 2024-04-11
16+
eslint:
17+
lastModifiedDate: 2024-04-11
18+
psscriptanalyzer:
19+
lastModifiedDate: 2024-04-11
20+
armory:
21+
lastModifiedDate: 2024-04-11

‎.config/CredScanSuppressions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
88
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
99
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
10-
"src/libraries/System.Security.Cryptography/tests/X509Certificates/TestData.cs",
10+
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
1111
"src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.key"
1212
],
1313
"placeholder": [

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
]
1010
},
1111
"dotnet-reportgenerator-globaltool": {
12-
"version": "5.0.2",
12+
"version": "5.3.0",
1313
"commands": [
1414
"reportgenerator"
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.24208.1",
18+
"version": "9.0.0-prerelease.24317.3",
1919
"commands": [
2020
"xharness"
2121
]

‎.config/guardian/.gdnbaselines‎

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

‎.devcontainer/scripts/onCreateCommand.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
set -e
44

55
function wasm_common() {
6-
# prebuild for WASM, so it is ready for wasm development
7-
make -C src/mono/browser provision-wasm
8-
export EMSDK_PATH=$PWD/src/mono/browser/emsdk
96
case "$1" in
107
wasm)
118
# Put your common commands for wasm here

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
"remoteEnv": {
5050
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
5151
"DOTNET_MULTILEVEL_LOOKUP": "0",
52-
// Path to provisioned Emscripten SDK, for rebuilding the wasm runtime
53-
"EMSDK_PATH": "${containerWorkspaceFolder}/src/mono/browser/emsdk",
5452
},
5553

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

‎.devcontainer/wasm/devcontainer.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
"remoteEnv": {
5050
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
5151
"DOTNET_MULTILEVEL_LOOKUP": "0",
52-
// Path to provisioned Emscripten SDK, for rebuilding the wasm runtime
53-
"EMSDK_PATH": "${containerWorkspaceFolder}/src/mono/browser/emsdk",
5452
},
5553

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

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ csharp_new_line_between_query_expression_clauses = true
3131
csharp_indent_block_contents = true
3232
csharp_indent_braces = false
3333
csharp_indent_case_contents = true
34-
csharp_indent_case_contents_when_block = true
34+
csharp_indent_case_contents_when_block = false
3535
csharp_indent_switch_labels = true
3636
csharp_indent_labels = one_less_than_current
3737

‎.gitattributes‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@
2727
*.cmd text eol=crlf
2828
*.bat text eol=crlf
2929

30-
*.cs text=auto diff=csharp
31-
*.vb text=auto
32-
*.resx text=auto
33-
*.c text=auto
34-
*.cpp text=auto
35-
*.cxx text=auto
36-
*.h text=auto
37-
*.hxx text=auto
38-
*.py text=auto
39-
*.rb text=auto
40-
*.java text=auto
41-
*.html text=auto
42-
*.htm text=auto
43-
*.css text=auto
44-
*.scss text=auto
45-
*.sass text=auto
46-
*.less text=auto
47-
*.js text=auto
48-
*.lisp text=auto
49-
*.clj text=auto
50-
*.sql text=auto
51-
*.php text=auto
52-
*.lua text=auto
53-
*.m text=auto
54-
*.asm text=auto
55-
*.erl text=auto
56-
*.fs text=auto
57-
*.fsx text=auto
58-
*.hs text=auto
30+
*.cs text diff=csharp
31+
*.vb text
32+
*.resx text
33+
*.c text
34+
*.cpp text
35+
*.cxx text
36+
*.h text
37+
*.hxx text
38+
*.py text
39+
*.rb text
40+
*.java text
41+
*.html text
42+
*.htm text
43+
*.css text
44+
*.scss text
45+
*.sass text
46+
*.less text
47+
*.js text
48+
*.lisp text
49+
*.clj text
50+
*.sql text
51+
*.php text
52+
*.lua text
53+
*.m text
54+
*.asm text
55+
*.erl text
56+
*.fs text
57+
*.fsx text
58+
*.hs text
5959

60-
*.csproj text=auto
61-
*.vbproj text=auto
62-
*.fsproj text=auto
63-
*.dbproj text=auto
64-
*.sln text=auto eol=crlf
60+
*.csproj text
61+
*.vbproj text
62+
*.fsproj text
63+
*.dbproj text
64+
*.sln text eol=crlf
6565

6666
# Set linguist language for .h files explicitly based on
6767
# https://github.com/github/linguist/issues/1626#issuecomment-401442069

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 5
8+
labels:
9+
- area-codeflow
10+
ignore:
11+
- dependency-name: "actions/checkout"
12+
update-types: ["version-update:semver-patch","version-update:semver-minor"]

0 commit comments

Comments
 (0)