Skip to content

Commit 8db5530

Browse files
akoeplingerakoeplinger
committed
Merge remote-tracking branch 'upstream/main' into fix-wasi-todo
2 parents a9ccbb4 + bcd9cb8 commit 8db5530

File tree

5,642 files changed

+213899
-78324
lines changed

Some content is hidden

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

5,642 files changed

+213899
-78324
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/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.24252.1",
18+
"version": "9.0.0-prerelease.24312.3",
1919
"commands": [
2020
"xharness"
2121
]

‎.config/guardian/.gdnbaselines

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
{
2-
"properties": {
3-
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4-
},
5-
"version": "1.0.0",
6-
"baselines": {
7-
"default": {
8-
"name": "default",
9-
"createdDate": "2024-04-10 20:32:31Z",
10-
"lastUpdatedDate": "2024-04-10 20:32:31Z"
11-
}
12-
},
13-
"results": {
14-
"3b1bb0185d74dd310884a85ad1252953dab0747790f5aecd5bf5bb3c1e2b515c": {
15-
"signature": "3b1bb0185d74dd310884a85ad1252953dab0747790f5aecd5bf5bb3c1e2b515c",
16-
"alternativeSignatures": [],
17-
"target": "src/libraries/System.Security.Cryptography/tests/X509Certificates/TestData.cs",
18-
"line": 3441,
19-
"memberOf": [
20-
"default"
21-
],
22-
"tool": "credscan",
23-
"ruleId": "CSCAN-GENERAL0060",
24-
"createdDate": "2024-04-10 20:32:31Z",
25-
"expirationDate": "2024-09-28 00:14:56Z",
26-
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
27-
},
28-
"2e4598005fdee72a4700697760c5f1b199c25d15a7c54de438ce939f125f3710": {
29-
"signature": "2e4598005fdee72a4700697760c5f1b199c25d15a7c54de438ce939f125f3710",
30-
"alternativeSignatures": [
31-
"6b533da7f95704f4476b24f493f88b2b1fd7d3bba69105bf63530140e0b3c8f1"
32-
],
33-
"target": "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_activedirectory_domaincontroller.ps1",
34-
"line": 36,
35-
"memberOf": [
36-
"default"
37-
],
38-
"tool": "psscriptanalyzer",
39-
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
40-
"createdDate": "2024-04-10 20:32:31Z",
41-
"expirationDate": "2024-09-28 00:14:56Z",
42-
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
43-
},
44-
"df6d1096725378c354a363dbb40fca84b9eed42a724ffbde7de57a88fc4042df": {
45-
"signature": "df6d1096725378c354a363dbb40fca84b9eed42a724ffbde7de57a88fc4042df",
46-
"alternativeSignatures": [
47-
"b090ab235a86ec5bc15243c19bc432f09e5aef816854bcbe120ab04c7c0332e1"
48-
],
49-
"target": "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_iisserver.ps1",
50-
"line": 82,
51-
"memberOf": [
52-
"default"
53-
],
54-
"tool": "psscriptanalyzer",
55-
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
56-
"createdDate": "2024-04-10 20:32:31Z",
57-
"expirationDate": "2024-09-28 00:14:56Z",
58-
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
59-
}
60-
}
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2024-04-10 20:32:31Z",
10+
"lastUpdatedDate": "2024-04-10 20:32:31Z"
11+
}
12+
},
13+
"results": {
14+
"3b1bb0185d74dd310884a85ad1252953dab0747790f5aecd5bf5bb3c1e2b515c": {
15+
"signature": "3b1bb0185d74dd310884a85ad1252953dab0747790f5aecd5bf5bb3c1e2b515c",
16+
"alternativeSignatures": [],
17+
"target": "src/libraries/System.Security.Cryptography/tests/X509Certificates/TestData.cs",
18+
"line": 3441,
19+
"memberOf": [
20+
"default"
21+
],
22+
"tool": "credscan",
23+
"ruleId": "CSCAN-GENERAL0060",
24+
"createdDate": "2024-04-10 20:32:31Z",
25+
"expirationDate": "2024-09-28 00:14:56Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
27+
},
28+
"2e4598005fdee72a4700697760c5f1b199c25d15a7c54de438ce939f125f3710": {
29+
"signature": "2e4598005fdee72a4700697760c5f1b199c25d15a7c54de438ce939f125f3710",
30+
"alternativeSignatures": [
31+
"6b533da7f95704f4476b24f493f88b2b1fd7d3bba69105bf63530140e0b3c8f1"
32+
],
33+
"target": "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_activedirectory_domaincontroller.ps1",
34+
"line": 36,
35+
"memberOf": [
36+
"default"
37+
],
38+
"tool": "psscriptanalyzer",
39+
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
40+
"createdDate": "2024-04-10 20:32:31Z",
41+
"expirationDate": "2024-09-28 00:14:56Z",
42+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
43+
},
44+
"df6d1096725378c354a363dbb40fca84b9eed42a724ffbde7de57a88fc4042df": {
45+
"signature": "df6d1096725378c354a363dbb40fca84b9eed42a724ffbde7de57a88fc4042df",
46+
"alternativeSignatures": [
47+
"b090ab235a86ec5bc15243c19bc432f09e5aef816854bcbe120ab04c7c0332e1"
48+
],
49+
"target": "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_iisserver.ps1",
50+
"line": 82,
51+
"memberOf": [
52+
"default"
53+
],
54+
"tool": "psscriptanalyzer",
55+
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
56+
"createdDate": "2024-04-10 20:32:31Z",
57+
"expirationDate": "2024-09-28 00:14:56Z",
58+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
59+
}
60+
}
6161
}

‎.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

0 commit comments

Comments
 (0)