Merge remote-tracking branch 'upstream/main' into http3-missing-data-…

…hunt

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -1,21 +1,21 @@
-## 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.
-
-pipelines:
-  679:
-    retail:
-      binary:
-        credscan:
-          lastModifiedDate: 2024-04-11
-        binskim:
-          lastModifiedDate: 2024-04-11
-        spotbugs:
-          lastModifiedDate: 2024-04-11
-      source:
-        credscan:
-          lastModifiedDate: 2024-04-11
-        eslint:
-          lastModifiedDate: 2024-04-11
-        psscriptanalyzer:
-          lastModifiedDate: 2024-04-11
-        armory:
-          lastModifiedDate: 2024-04-11
+## 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.
+
+pipelines:
+  679:
+    retail:
+      binary:
+        credscan:
+          lastModifiedDate: 2024-04-11
+        binskim:
+          lastModifiedDate: 2024-04-11
+        spotbugs:
+          lastModifiedDate: 2024-04-11
+      source:
+        credscan:
+          lastModifiedDate: 2024-04-11
+        eslint:
+          lastModifiedDate: 2024-04-11
+        psscriptanalyzer:
+          lastModifiedDate: 2024-04-11
+        armory:
+          lastModifiedDate: 2024-04-11

.config/CredScanSuppressions.json

@@ -7,7 +7,7 @@
                 "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
                 "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
                 "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
-                "src/libraries/System.Security.Cryptography/tests/X509Certificates/TestData.cs",
+                "src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
                 "src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.key"
             ],
             "placeholder": [

.config/dotnet-tools.json

@@ -9,13 +9,13 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.0.2",
+      "version": "5.3.0",
       "commands": [
         "reportgenerator"
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "9.0.0-prerelease.24208.1",
+      "version": "9.0.0-prerelease.24317.3",
       "commands": [
         "xharness"
       ]

.devcontainer/scripts/onCreateCommand.sh

@@ -3,9 +3,6 @@
 set -e
 
 function wasm_common() {
-    # prebuild for WASM, so it is ready for wasm development
-    make -C src/mono/browser provision-wasm
-    export EMSDK_PATH=$PWD/src/mono/browser/emsdk
     case "$1" in
     wasm)
         # Put your common commands for wasm here

.devcontainer/wasm-multiThreaded/devcontainer.json

@@ -49,8 +49,6 @@
 	"remoteEnv": {
 		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
 		"DOTNET_MULTILEVEL_LOOKUP": "0",
-		// Path to provisioned Emscripten SDK, for rebuilding the wasm runtime
-		"EMSDK_PATH": "${containerWorkspaceFolder}/src/mono/browser/emsdk",
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

.devcontainer/wasm/devcontainer.json

@@ -49,8 +49,6 @@
 	"remoteEnv": {
 		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
 		"DOTNET_MULTILEVEL_LOOKUP": "0",
-		// Path to provisioned Emscripten SDK, for rebuilding the wasm runtime
-		"EMSDK_PATH": "${containerWorkspaceFolder}/src/mono/browser/emsdk",
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

.editorconfig

@@ -31,7 +31,7 @@ csharp_new_line_between_query_expression_clauses = true
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
+csharp_indent_case_contents_when_block = false
 csharp_indent_switch_labels = true
 csharp_indent_labels = one_less_than_current
 

.gitattributes

@@ -27,41 +27,41 @@
 *.cmd text eol=crlf
 *.bat text eol=crlf
 
-*.cs text=auto diff=csharp
-*.vb text=auto
-*.resx text=auto
-*.c text=auto
-*.cpp text=auto
-*.cxx text=auto
-*.h text=auto
-*.hxx text=auto
-*.py text=auto
-*.rb text=auto
-*.java text=auto
-*.html text=auto
-*.htm text=auto
-*.css text=auto
-*.scss text=auto
-*.sass text=auto
-*.less text=auto
-*.js text=auto
-*.lisp text=auto
-*.clj text=auto
-*.sql text=auto
-*.php text=auto
-*.lua text=auto
-*.m text=auto
-*.asm text=auto
-*.erl text=auto
-*.fs text=auto
-*.fsx text=auto
-*.hs text=auto
+*.cs text diff=csharp
+*.vb text
+*.resx text
+*.c text
+*.cpp text
+*.cxx text
+*.h text
+*.hxx text
+*.py text
+*.rb text
+*.java text
+*.html text
+*.htm text
+*.css text
+*.scss text
+*.sass text
+*.less text
+*.js text
+*.lisp text
+*.clj text
+*.sql text
+*.php text
+*.lua text
+*.m text
+*.asm text
+*.erl text
+*.fs text
+*.fsx text
+*.hs text
 
-*.csproj text=auto
-*.vbproj text=auto
-*.fsproj text=auto
-*.dbproj text=auto
-*.sln text=auto eol=crlf
+*.csproj text
+*.vbproj text
+*.fsproj text
+*.dbproj text
+*.sln text eol=crlf
 
 # Set linguist language for .h files explicitly based on
 # https://github.com/github/linguist/issues/1626#issuecomment-401442069

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 5
+    labels:
+      - area-codeflow
+    ignore:
+      - dependency-name: "actions/checkout"
+        update-types: ["version-update:semver-patch","version-update:semver-minor"]