Increase FileSystemWatcher test event timeout to 1000ms

.CodeQL.yml

@@ -1,5 +1,5 @@
 # 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
+# https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
 # (Access restricted to Microsoft employees only.)
 
 path_classifiers:
@@ -8,3 +8,26 @@ path_classifiers:
     # 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/*
+  cmake_internal:
+    # exclude artifacts/obj/**/CMakeFiles/**/CheckFunctionExists.c since CMake 
+    # generates random directory names causing creation of duplicate issues 
+    # related to obsolete encryption algorithm used. Note that CheckFuntionExists 
+    # files are generated as part of build-time checks in CMake and are not compiled
+    # or linked into any product binaries.
+    - artifacts/obj/**/CMakeFiles/**/CheckFunctionExists.c
+
+queries:
+  #
+  # REPO-WIDE RULE EXCLUSIONS
+  #
+  - exclude:
+      queryid:
+        # [Serializable] doesn't imply that a type is *safe* to [de]serialize; only that it is
+        # *possible* to do so. The rules below incorrectly assume we're trying to make a safety
+        # guarantee.
+        - "cs/dangerous-deserialization-routine"
+        - "cs/deserialization-of-pointer-type"
+        # We already have CodeQL + Roslyn rules running to detect usage of dangerous deserialization
+        # APIs. Those call sites are well-reviewed and don't benefit from extra alerts regarding
+        # the possibility of loading malicious code.
+        - "cs/deserialization-unexpected-subtypes"

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.config/CredScanSuppressions.json

@@ -1,25 +1,19 @@
 {
-    "tool": "Credential Scanner",
-    "suppressions": [
-        {
-            "_justification": "Suppression approved. Private key for testing purpose.",
-            "file": [
-                "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/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
-                "src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.key"
-            ],
-            "placeholder": [
-                "-----BEGIN PRIVATE KEY-----",
-                "-----BEGIN * PRIVATE KEY-----"
-            ]
-        },
-        {
-            "_justification": "Suppression approved. Private key for testing purpose.",
-            "file": [
-                "src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.pfx"
-            ]
-        }
-    ]
+  "tool": "Credential Scanner",
+  "suppressions": [
+    {
+      "_justification": "Suppression approved. Private key for testing purpose.",
+      "file": [
+        "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/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
+        "src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs"
+      ],
+      "placeholder": [
+        "-----BEGIN PRIVATE KEY-----",
+        "-----BEGIN * PRIVATE KEY-----"
+      ]
+    }
+  ]
 }

.config/dotnet-tools.json

@@ -3,25 +3,25 @@
   "isRoot": true,
   "tools": {
     "coverlet.console": {
-      "version": "6.0.0",
+      "version": "6.0.4",
       "commands": [
         "coverlet"
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.0",
+      "version": "5.4.3",
       "commands": [
         "reportgenerator"
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "9.0.0-prerelease.24405.1",
+      "version": "11.0.0-prerelease.26160.2",
       "commands": [
         "xharness"
       ]
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "11.1.0",
+      "version": "12.0.15",
       "commands": [
         "slngen"
       ]

.config/tsaoptions.json

@@ -2,9 +2,10 @@
     "instanceUrl": "https://devdiv.visualstudio.com/",
     "template": "TFSDEVDIV",
     "projectName": "DEVDIV",
-    "areaPath": "DevDiv\\NET Libraries",
+    "areaPath": "DevDiv\\NET Runtime",
     "iterationPath": "DevDiv",
     "notificationAliases": [ "runtimerepo-infra@microsoft.com" ],
     "repositoryName": "Runtime",
-    "codebaseName": "Runtime"
-}
+    "codebaseName": "Runtime",
+    "serviceTreeId": "1dc8dedc-8f5f-4b94-b182-ec3bdfb207b0"
+}

.devcontainer/Dockerfile

@@ -1,28 +1,21 @@
 # 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
-# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources
-RUN apt-get update \
-    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \
-    && apt-get install software-properties-common -y \
-    && add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \
-    && apt-get update \
-    && apt-get install clang-18 -y
+ARG VARIANT="8.0-noble"
+FROM mcr.microsoft.com/devcontainers/dotnet:${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 \
+        clang \
         cmake \
+        cpio \
         build-essential \
         python3 \
         curl \
         git \
         lldb \
+        llvm \
         liblldb-dev \
         libunwind8 \
         libunwind8-dev \
@@ -31,6 +24,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         liblttng-ust-dev \
         libssl-dev \
         libkrb5-dev \
-        zlib1g-dev \
         ninja-build \
         tzdata

.devcontainer/android/Dockerfile

@@ -1,17 +1,18 @@
-ARG VARIANT="8.0-jammy"
+ARG VARIANT="8.0-noble"
 FROM mcr.microsoft.com/devcontainers/dotnet:${VARIANT}
 
 # Set up machine requirements to build the repo
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
-        cmake \
-        llvm \
         clang \
+        cmake \
+        cpio \
         build-essential \
         python3 \
         curl \
         git \
         lldb \
+        llvm \
         liblldb-dev \
         libunwind8 \
         libunwind8-dev \
@@ -20,17 +21,17 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         liblttng-ust-dev \
         libssl-dev \
         libkrb5-dev \
-        zlib1g-dev \
+        ninja-build \
         ninja-build \
         openjdk-17-jdk \
         pulseaudio
 
 SHELL ["/bin/bash", "-c"]
 
-ENV NDK_VER=r23c
-ENV SDK_VER=9123335_latest
-ENV SDK_API_LEVEL=33
-ENV SDK_BUILD_TOOLS=33.0.1
+ENV NDK_VER=r27c
+ENV SDK_VER=13114758_latest
+ENV SDK_API_LEVEL=35
+ENV SDK_BUILD_TOOLS=35.0.0
 ENV HOST_OS=linux
 ENV HOST_OS_SHORT=linux
 ENV ANDROID_NDK_ROOT=/android/android-ndk-${NDK_VER}
@@ -42,7 +43,7 @@ RUN curl -sSL --tlsv1.2 https://dl.google.com/android/repository/android-ndk-${N
     curl -sSL --tlsv1.2 https://dl.google.com/android/repository/commandlinetools-${HOST_OS_SHORT}-${SDK_VER}.zip -L --output /tmp/asdk.zip
 
 # Check hashes of downloads
-RUN (echo "6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242 /tmp/andk.zip"; echo "0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a /tmp/asdk.zip") | cat | sha256sum -c
+RUN (echo "59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc /tmp/andk.zip"; echo "7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee /tmp/asdk.zip") | cat | sha256sum -c
 
 # Unpack the NDK and SDK
 RUN mkdir -p ${ANDROID_NDK_ROOT} && unzip /tmp/andk.zip -d $(dirname ${ANDROID_NDK_ROOT}) && rm -f /tmp/andk.zip && \

.devcontainer/android/devcontainer.json

@@ -4,7 +4,7 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			"VARIANT": "8.0-jammy"
+			"VARIANT": "8.0-noble"
 		}
 	},
     // The container needs to run privileged in order to use Linux KVM to create Android emulators.
@@ -29,7 +29,8 @@
 		"vscode": {
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
-				"ms-dotnettools.csharp"
+				"ms-dotnettools.csharp",
+				"ms-dotnettools.csdevkit"
 			],
 			"settings": {
 				// Loading projects on demand is better for larger codebases
@@ -54,8 +55,7 @@
 	// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
     // Add the Android SDK tooling and emulator to the path.
 	"remoteEnv": {
-		"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}",
-		"DOTNET_MULTILEVEL_LOOKUP": "0"
+		"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}"
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

.devcontainer/devcontainer.json

@@ -4,17 +4,19 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
-			"VARIANT": "6.0-jammy"
+			"VARIANT": "8.0-noble"
 		}
 	},
 	"hostRequirements": {
 		"cpus": 4,
-		"memory": "8gb"
+		"memory": "8gb",
+		"storage": "64gb"
 	},
 
 	"features": {
-		"ghcr.io/devcontainers/features/github-cli:1": {}
+		"ghcr.io/devcontainers/features/github-cli:1": {},
+		"ghcr.io/devcontainers/features/sshd:1": {},
+		"ghcr.io/devcontainers/features/copilot-cli:1": {}
 	},
 
 	// Configure tool-specific properties.
@@ -23,7 +25,8 @@
 		"vscode": {
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
-				"ms-dotnettools.csharp"
+				"ms-dotnettools.csharp",
+				"ms-dotnettools.csdevkit"
 			],
 			"settings": {
 				// Loading projects on demand is better for larger codebases
@@ -39,8 +42,7 @@
 	// 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.
 	"remoteEnv": {
-		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
-		"DOTNET_MULTILEVEL_LOOKUP": "0"
+		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

.devcontainer/libraries/devcontainer.json

@@ -4,13 +4,13 @@
 	"build": {
 		"dockerfile": "../Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
-			"VARIANT": "6.0-jammy"
+			"VARIANT": "8.0-noble"
 		}
 	},
 	"hostRequirements": {
 		"cpus": 4,
-		"memory": "8gb"
+		"memory": "8gb",
+		"storage": "64gb"
 	},
 
 	"features": {
@@ -23,7 +23,8 @@
 		"vscode": {
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
-				"ms-dotnettools.csharp"
+				"ms-dotnettools.csharp",
+				"ms-dotnettools.csdevkit"
 			],
 			"settings": {
 				// Loading projects on demand is better for larger codebases
@@ -45,8 +46,7 @@
 	// 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.
 	"remoteEnv": {
-		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
-		"DOTNET_MULTILEVEL_LOOKUP": "0"
+		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

.devcontainer/scripts/onCreateCommand.sh

@@ -31,7 +31,7 @@ case "$opt" in
 
     android)
         # prebuild the repo for Mono, so it is ready for development
-        ./build.sh mono+libs -os android
+        ./build.sh mono+libs+clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages -os android
         # restore libs tests so that the project is ready to be loaded by OmniSharp
         ./build.sh libs.tests -restore
     ;;

.devcontainer/wasm-multiThreaded/Dockerfile

@@ -1,28 +1,21 @@
 # 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
-# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources
-RUN apt-get update \
-    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \
-    && apt-get install software-properties-common -y \
-    && add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \
-    && apt-get update \
-    && apt-get install clang-18 -y
+ARG VARIANT="8.0-noble"
+FROM mcr.microsoft.com/devcontainers/dotnet:${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 \
+        clang \
         cmake \
+        cpio \
         build-essential \
         python3 \
         curl \
         git \
         lldb \
+        llvm \
         liblldb-dev \
         libunwind8 \
         libunwind8-dev \
@@ -31,7 +24,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         liblttng-ust-dev \
         libssl-dev \
         libkrb5-dev \
-        zlib1g-dev \
         ninja-build
 
 SHELL ["/bin/bash", "-c"]
@@ -59,7 +51,7 @@ RUN sudo apt-get install libnss3 -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
+    && apt-get install libasound2t64 -y
 
 # install firefox dependencies to run debugger tests:
 RUN sudo apt-get install libdbus-glib-1-2 -y \