Merge branch 'main' into BigIntegerDivide

# Conflicts:
#	src/libraries/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.Utils.cs

.CodeQL.yml

@@ -0,0 +1,10 @@
+# This file configures CodeQL runs and TSA bug autofiling. For more information, see:
+# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
+# (Access restricted to Microsoft employees only.)
+
+path_classifiers:
+  refs:
+    # The ref/ directories don't contain shipping implementations of code, so they should
+    # be excluded from analysis. If there is a problem at the API layer, the analysis
+    # engine will detect the problem in the src/ implementations anyway.
+    - src/libraries/**/ref/*

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +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

.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.24112.4",
+      "version": "9.0.0-prerelease.24317.3",
       "commands": [
         "xharness"
       ]

.devcontainer/Dockerfile

@@ -25,4 +25,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         libssl-dev \
         libkrb5-dev \
         zlib1g-dev \
-        ninja-build
+        ninja-build \
+        tzdata

.devcontainer/scripts/onCreateCommand.sh

@@ -2,6 +2,23 @@
 
 set -e
 
+function wasm_common() {
+    case "$1" in
+    wasm)
+        # Put your common commands for wasm here
+        ./build.sh mono+libs -os browser -c Release
+        ;;
+    wasm-multithreaded)
+        # Put your common commands for wasm-multithread here
+        ./build.sh mono+libs -os browser -c Release /p:WasmEnableThreads=true
+        ;;
+    *)
+        # install dotnet-serve for running wasm samples
+    ./dotnet.sh tool install dotnet-serve --version 1.10.172 --tool-path ./.dotnet-tools-global
+    ;;
+    esac
+}
+
 opt=$1
 case "$opt" in
 
@@ -20,15 +37,13 @@ case "$opt" in
     ;;
 
     wasm)
-        # 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
-        ./build.sh mono+libs -os browser -c Release
+        wasm_common $opt
+    ;;
 
-        # install dotnet-serve for running wasm samples
-        ./dotnet.sh tool install dotnet-serve --version 1.10.172 --tool-path ./.dotnet-tools-global
+    wasm-multithreaded)
+        wasm_common $opt
     ;;
 esac
 
 # save the commit hash of the currently built assemblies, so developers know which version was built
-git rev-parse HEAD > ./artifacts/prebuild.sha
+git rev-parse HEAD > ./artifacts/prebuild.sha

.devcontainer/scripts/postCreateCommand.sh

@@ -11,4 +11,4 @@ case "$opt" in
 esac
 
 # reset the repo to the commit hash that was used to build the prebuilt Codespace
-git reset --hard $(cat ./artifacts/prebuild.sha)
+git reset --hard $(cat ./artifacts/prebuild.sha)

.devcontainer/wasm-multiThreaded/Dockerfile

@@ -0,0 +1,60 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
+# For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
+
+# [Choice] .NET version: 6.0, 7.0
+ARG VARIANT="6.0-jammy"
+FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
+
+# Set up machine requirements to build the repo and the gh CLI
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends \
+        cmake \
+        llvm \
+        clang \
+        build-essential \
+        python3 \
+        curl \
+        git \
+        lldb \
+        liblldb-dev \
+        libunwind8 \
+        libunwind8-dev \
+        gettext \
+        libicu-dev \
+        liblttng-ust-dev \
+        libssl-dev \
+        libkrb5-dev \
+        zlib1g-dev \
+        ninja-build
+
+SHELL ["/bin/bash", "-c"]
+
+# Install LTS npm and node
+RUN source /usr/local/share/nvm/nvm.sh && nvm install --lts
+
+# Install V8 Engine
+RUN curl -sSL "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/chromium-v8/v8-linux64-rel-10.8.168.zip" -o ./v8.zip \
+    && unzip ./v8.zip -d /usr/local/v8 \
+    && echo $'#!/usr/bin/env bash\n\
+"/usr/local/v8/d8" --snapshot_blob="/usr/local/v8/snapshot_blob.bin" "$@"\n' > /usr/local/bin/v8 \
+    && chmod +x /usr/local/bin/v8
+
+# install chromium dependencies to run debugger tests:
+RUN sudo apt-get install libnss3 -y \
+    && apt-get install libatk1.0-0 -y \
+    && apt-get install libatk-bridge2.0-0 -y \
+    && apt-get install libcups2 -y \
+    && apt-get install libdrm2 -y \
+    && apt-get install libxkbcommon-x11-0 -y \
+    && apt-get install libxcomposite-dev -y \
+    && apt-get install libxdamage1 -y \
+    && apt-get install libxrandr2 -y \
+    && apt-get install libgbm-dev -y \
+    && apt-get install libpango-1.0-0 -y \
+    && apt-get install libcairo2 -y \
+    && apt-get install libasound2 -y
+
+# install firefox dependencies to run debugger tests:
+RUN sudo apt-get install libdbus-glib-1-2 -y \
+    && apt-get install libgtk-3-0 -y \
+    && apt-get install libx11-xcb-dev  -y

.devcontainer/wasm-multiThreaded/devcontainer.json

@@ -0,0 +1,64 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+	"name": "WASM multithreaded development (prebuilt)",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
+			"VARIANT": "6.0-jammy"
+		}
+	},
+	"hostRequirements": {
+		"cpus": 4,
+		"memory": "8gb",
+		"storage": "40gb"
+	},
+
+	"features": {
+		"ghcr.io/devcontainers/features/github-cli:1": {}
+	},
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"ms-dotnettools.csharp"
+			],
+			"settings": {
+				// Loading projects on demand is better for larger codebases
+				"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
+				"omnisharp.enableRoslynAnalyzers": true,
+				"omnisharp.enableEditorConfigSupport": true,
+				"omnisharp.enableAsyncCompletion": true,
+				"omnisharp.testRunSettings": "${containerWorkspaceFolder}/artifacts/obj/vscode/.runsettings"
+			}
+		}
+	},
+
+	// Use 'onCreateCommand' to run pre-build commands inside the codespace
+	"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/onCreateCommand.sh wasm-multithreaded",
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh wasm-multithreaded",
+
+	// Add the locally installed dotnet to the path to ensure that it is activated
+	// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
+	// Add the global tools dir to the PATH so that globally installed tools will work
+	"remoteEnv": {
+		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
+		"DOTNET_MULTILEVEL_LOOKUP": "0",
+	},
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+
+	// Forward mono samples port
+	"forwardPorts": [8000],
+	"portsAttributes": {
+		"8000": {
+			"label": "mono wasm samples (8000)",
+		}
+	}
+}

.devcontainer/wasm/devcontainer.json

@@ -1,6 +1,6 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
-	"name": "WASM development (prebuilt)",
+	"name": "WASM singlethreaded development (prebuilt)",
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
@@ -10,7 +10,8 @@
 	},
 	"hostRequirements": {
 		"cpus": 4,
-		"memory": "8gb"
+		"memory": "8gb",
+		"storage": "40gb"
 	},
 
 	"features": {
@@ -40,16 +41,14 @@
 	"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/onCreateCommand.sh wasm",
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh",
+	"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh wasm",
 
 	// Add the locally installed dotnet to the path to ensure that it is activated
 	// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
 	// Add the global tools dir to the PATH so that globally installed tools will work
 	"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
 
@@ -92,6 +92,7 @@ dotnet_style_readonly_field = true:suggestion
 # Expression-level preferences
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_exactly_match
 dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion

.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