[NativeAOT-LLVM]: Merge sep 25

.config/dotnet-tools.json

@@ -15,13 +15,13 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "10.0.0-prerelease.25077.1",
+      "version": "10.0.0-prerelease.25412.1",
       "commands": [
         "xharness"
       ]
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "11.1.0",
+      "version": "12.0.15",
       "commands": [
         "slngen"
       ]

.devcontainer/android/Dockerfile

@@ -28,10 +28,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 
 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}
@@ -43,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/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
     ;;

.editorconfig

@@ -155,6 +155,10 @@ csharp_space_between_square_brackets = false
 # License header
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
 
+[src/libraries/System.Net.Http/src/System/Net/Http/{SocketsHttpHandler/Http3RequestStream.cs,BrowserHttpHandler/BrowserHttpHandler.cs}]
+# disable CA2025, the analyzer throws a NullReferenceException when processing this file: https://github.com/dotnet/roslyn-analyzers/issues/7652
+dotnet_diagnostic.CA2025.severity = none
+
 # C++ Files
 [*.{cpp,h,in}]
 curly_bracket_next_line = true

.github/CODEOWNERS-stop-notifications

@@ -1,7 +1,6 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
-/src/libraries/Common/src/Interop/                                  @dotnet/platform-deps-team
 /src/libraries/Common/src/System/Net/Http/aspnetcore/               @dotnet/http
 /src/libraries/Common/tests/Tests/System/Net/aspnetcore/            @dotnet/http
 
@@ -10,6 +9,8 @@
 /src/coreclr/inc/corinfo.h @dotnet/jit-contrib
 /src/coreclr/inc/corjit.h @dotnet/jit-contrib
 /src/coreclr/jit/ @dotnet/jit-contrib
+/src/coreclr/interpreter/ @brzvlad @janvorli @kg
+/src/coreclr/vm/interpexec* @brzvlad @janvorli @kg
 /src/coreclr/nativeaot @MichalStrehovsky
 /src/coreclr/tools/Common @dotnet/crossgen-contrib @MichalStrehovsky
 /src/coreclr/tools/aot @dotnet/crossgen-contrib

.github/copilot-instructions.md

@@ -0,0 +1,313 @@
+**Any code you commit SHOULD compile, and new and existing tests related to the change SHOULD pass.**
+
+You MUST make your best effort to ensure your changes satisfy those criteria before committing. If for any reason you were unable to build or test the changes, you MUST report that. You MUST NOT claim success unless all builds and tests pass as described above.
+
+You MUST refer to the [Building & Testing in dotnet/runtime](#building--testing-in-dotnetruntime) instructions and use the commands and approaches specified there before attempting your own suggestions.
+
+You MUST follow all code-formatting and naming conventions defined in [`.editorconfig`](/.editorconfig).
+
+In addition to the rules enforced by `.editorconfig`, you SHOULD:
+
+- Prefer file-scoped namespace declarations and single-line using directives.
+- Ensure that the final return statement of a method is on its own line.
+- Use pattern matching and switch expressions wherever possible.
+- Use `nameof` instead of string literals when referring to member names.
+- Always use `is null` or `is not null` instead of `== null` or `!= null`.
+- Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
+- Prefer `?.` if applicable (e.g. `scope?.Dispose()`).
+- Use `ObjectDisposedException.ThrowIf` where applicable.
+- When adding new unit tests, strongly prefer to add them to existing test code files rather than creating new code files.
+- If you add new code files, ensure they are listed in the csproj file (if other files in that folder are listed there) so they build.
+- When running tests, if possible use filters and check test run counts, or look at test logs, to ensure they actually ran.
+- Do not finish work with any tests commented out or disabled that were not previously commented out or disabled.
+- When writing tests, do not emit "Act", "Arrange" or "Assert" comments.
+
+---
+
+# Building & Testing in dotnet/runtime
+
+- [1. Prerequisites](#1-prerequisites)
+    - [1.1. Determine Affected Components](#11-determine-affected-components)
+    - [1.2. Baseline Setup](#12-baseline-setup)
+- [2. Iterative Build and Test Strategy](#2-iterative-build-and-test-strategy)
+    - [2.1. Success Criteria](#21-success-criteria)
+- [3. CoreCLR (CLR) Workflow](#3-coreclr-clr-workflow)
+- [4. Mono Runtime Workflow](#4-mono-runtime-workflow)
+- [5. Libraries Workflow](#5-libraries-workflow)
+    - [5.1. How To: Identify Affected Libraries](#51-how-to-identify-affected-libraries)
+    - [5.2. How To: Build and Test Specific Library](#52-how-to-build-and-test-specific-library)
+- [6. WebAssembly (WASM) Libraries Workflow](#6-webassembly-wasm-libraries-workflow)
+- [7. Host Workflow](#7-host-workflow)
+- [8. Additional Notes](#8-additional-notes)
+    - [8.1. Troubleshooting](#81-troubleshooting)
+    - [8.2. Windows Command Equivalents](#82-windows-command-equivalents)
+    - [8.3. References](#83-references)
+
+## 1. Prerequisites
+
+These steps need to be done **before** applying any changes.
+
+### 1.1. Determine Affected Components
+
+Identify which components will be impacted by the changes. If in doubt, analyze the paths of the files to be updated:
+
+- **CoreCLR (CLR):** Changes in `src/coreclr/` or `src/tests/`
+- **Mono Runtime:** Changes in `src/mono/`
+- **Libraries:** Changes in `src/libraries/`
+- **WASM/WASI Libraries:** Changes in `src/libraries/` *and* the affected library targets WASM or WASI *and* the changes are included for the target (see below for details).
+- **Host:** Changes in `src/native/corehost/`, `src/installer/managed/`, or `src/installer/tests/`
+- If none above apply, it is most possibly an infra-only or a docs-only change. Skip build and test steps.
+
+**WASM/WASI Library Change Detection**
+
+A change is considered WASM/WASI-relevant if:
+
+- The relevant `.csproj` contains explicit Browser/WASM or WASI targets (look for `<TargetFrameworks>`, `$(TargetPlatformIdentifier)`, or `Condition` attributes referencing `browser` or `wasi`, as well as `TARGET_BROWSER` or `TARGET_WASI` constants), **and**
+- The changed file is not excluded from the build for that platform in any way with a `Condition` attribute on `<ItemGroup>` or `<Compile>`.
+
+---
+
+### 1.2. Baseline Setup
+
+Before applying any changes, ensure you have a full successful build of the needed runtime+libraries as a baseline.
+
+1. Checkout `main` branch
+
+2. From the repository root, run the build depending on the affected component. If multiple components are affected, subsequently run and verify the builds for all of them.
+    - **CoreCLR (CLR):** `./build.sh clr+libs+host`
+    - **Mono Runtime:** `./build.sh mono+libs`
+    - **Libraries:** `./build.sh clr+libs -rc release`
+    - **WASM/WASI Libraries:** `./build.sh mono+libs -os browser`
+    - **Host:** `./build.sh clr+libs+host -rc release -lc release`
+
+3. Verify the build completed without error.
+    - _If the baseline build failed, report the failure and don't proceed with the changes._
+
+4. From the repository root:
+    - Configure PATH: `export PATH="$(pwd)/.dotnet:$PATH"`
+    - Verify SDK Version: `dotnet --version` should match `sdk.version` in `global.json`.
+
+5. Switch back to the working branch.
+
+---
+
+## 2. Iterative Build and Test Strategy
+
+1. Apply the intended changes
+
+2. **Attempt Build.** If the build fails, attempt to fix and retry the step (up to 5 attempts).
+
+3. **Attempt Test.**
+    - If a test _build_ fails, attempt to fix and retry the step (up to 5 attempts).
+    - If a test _run_ fails,
+        - Determine if the problem is in the test or in the source
+        - If the problem is in the test, attempt to fix and retry the step (up to 5 attempts).
+        - If the problem is in the source, reconsider the full changeset, attempt to fix and repeat the workflow.
+
+4. **Workflow Iteration:**
+    - Repeat build and test up to 5 cycles.
+    - If issues persist after 5 workflow cycles, report failure.
+    - If the same error persists after each fix attempt, do not repeat the same fix. Instead, escalate or report with full logs.
+
+When retrying, attempt different fixes and adjust based on the build/test results.
+
+### 2.1. Success Criteria
+
+- **Build:**
+    - Completes without errors.
+    - Any non-zero exit code from build commands is considered a failure.
+
+- **Tests:**
+    - All tests must pass (zero failures).
+    - Any non-zero exit code from test commands is considered a failure.
+
+- **Workflow:**
+    - On success: Report completion
+    - Otherwise: Report error(s) with logs for diagnostics.
+        - Collect logs from `artifacts/log/` and the console output for both build and test steps.
+        - Attach relevant log files or error snippets when reporting failures.
+
+---
+
+## 3. CoreCLR (CLR) Workflow
+
+From the repository root:
+
+- Build:
+  `./build.sh clr`
+
+- Run tests:
+  `cd src/tests && ./build.sh && ./run.sh`
+
+- More info can be found in the dedicated workflow docs:
+    - [Building CoreCLR Guide](/docs/workflow/building/coreclr/README.md)
+    - [Building and Running CoreCLR Tests](/docs/workflow/testing/coreclr/testing.md)
+
+---
+
+## 4. Mono Runtime Workflow
+
+From the repository root:
+
+- Build:
+  `./build.sh mono+libs`
+
+- Run tests:
+
+  ```bash
+  ./build.sh clr.host
+  cd src/tests
+  ./build.sh mono debug /p:LibrariesConfiguration=debug
+  ./run.sh
+  ```
+
+- More info can be found in the dedicated workflow docs:
+    - [Building Mono](/docs/workflow/building/mono/README.md)
+    - [Running test suites using Mono](/docs/workflow/testing/mono/testing.md)
+
+---
+
+## 5. Libraries Workflow
+
+From the repository root:
+
+- Build all libraries:
+  `./build.sh libs -rc release`
+
+- Run all tests for libraries:
+  `./build.sh libs.tests -test -rc release`
+
+- Build a specific library:
+    - Refer to the section [5.2. How To: Build and Test Specific Library](#52-how-to-build-and-test-specific-library) below.
+
+- Test a specific library:
+    - Refer to the sections [5.1. How To: Identify Affected Libraries](#51-how-to-identify-affected-libraries) and [5.2. How To: Build and Test Specific Library](#52-how-to-build-and-test-specific-library) below.
+
+- More info can be found in the dedicated workflow docs:
+    - [Build Libraries](/docs/workflow/building/libraries/README.md)
+    - [Testing Libraries](/docs/workflow/testing/libraries/testing.md)
+
+### 5.1. How To: Identify Affected Libraries
+
+For each changed file under `src/libraries/`, find the matching library and its test project(s).
+Most libraries use:
+
+- Source: `src/libraries/<LibraryName>/src/<LibraryName>.csproj`
+
+- Tests (single):
+    - `src/libraries/<LibraryName>/tests/<LibraryName>.Tests.csproj`
+    - OR `src/libraries/<LibraryName>/tests/<LibraryName>.Tests/<LibraryName>.Tests.csproj`
+
+- Tests (multiple types):
+    - `src/libraries/<LibraryName>/tests/FunctionalTests/<LibraryName>.Functional.Tests.csproj`
+    - `src/libraries/<LibraryName>/tests/UnitTests/<LibraryName>.Unit.Tests.csproj`
+    - Or similar.
+
+---
+
+### 5.2. How To: Build and Test Specific Library
+
+If only one library is affected:
+
+1. **Navigate to the library directory:**
+   `cd src/libraries/<LibraryName>`
+
+2. **Build the library:**
+   `dotnet build`
+
+3. **Build and run all test projects:**
+
+    - For each discovered `*.Tests.csproj` in the `tests` subdirectory:
+      `dotnet build /t:test ./tests/<TestProject>.csproj`
+
+        - *Adjust path as needed. If in doubt, search with `find tests -name '*.csproj'`.*
+
+    - `dotnet build /t:test` is generally preferred over `dotnet test`
+
+---
+
+## 6. WebAssembly (WASM) Libraries Workflow
+
+From the repository root:
+
+- Build:
+  `./build.sh libs -os browser`
+
+- Run tests:
+  `./build.sh libs.tests -test -os browser`
+
+- More info can be found in the dedicated workflow docs:
+    - [Build libraries for WebAssembly](/docs/workflow/building/libraries/webassembly-instructions.md)
+    - [Testing Libraries on WebAssembly](/docs/workflow/testing/libraries/testing-wasm.md)
+
+---
+
+## 7. Host Workflow
+
+From the repository root:
+
+- Build:
+  `./build.sh host -rc release -lc release`
+
+- Run all tests:
+  `./build.sh host.tests -rc release -lc release -test`
+
+- More info can be found in the dedicated workflow docs:
+    - [Building and running host tests](/docs/workflow/testing/host/testing.md)
+
+---
+
+## 8. Additional Notes
+
+### 8.1. Troubleshooting
+
+- **Shared Framework Missing**
+
+    - If the build fails with an error "The shared framework must be built before the local targeting pack can be consumed.", build both the runtime (clr or mono) and the libs.
+      E.g., from the repo root, run `./build.sh clr+libs -rc release` if working on Libraries on CoreCLR. To find the applicable command, refer to the section [1.2. Baseline Setup](#12-baseline-setup).
+
+- **Testhost Is Missing**
+
+    - If a test run fails with errors indicating a missing testhost, such as:
+        - "Failed to launch testhost with error: System.IO.FileNotFoundException", or
+        - "artifacts/bin/testhost/... No such file or directory",
+      that means some of the prerequisites were not built.
+
+    - To resolve, build both the appropriate runtime (clr or mono) and the libs as a single command before running tests.
+      E.g., from the repo root, run `./build.sh clr+libs -rc release` before testing Libraries on CoreCLR. To find the applicable command, refer to the section [1.2. Baseline Setup](#12-baseline-setup).
+
+- **Build Timeout**
+
+    - Do not fail or cancel initial `./build.sh` builds due to timeout unless at least 40 minutes have elapsed.
+      A full `clr+libs` build from scratch can take up to 32 minutes or more on some systems.
+
+    - Only wait for long-running `./build.sh` commands if they continue to produce output.
+      If there is no output for 5 minutes, assume the build is stuck and fail early.
+
+- **Target Does Not Exist**
+
+    - Avoid specifying a target framework when building unless explicitly asked.
+      Build should identify and select the appropriate `$(NetCoreAppCurrent)` automatically.
+
+---
+
+### 8.2. Windows Command Equivalents
+
+- Use `build.cmd` instead of `build.sh` on Windows.
+- Set PATH: `set PATH=%CD%\.dotnet;%PATH%`
+- All other commands are similar unless otherwise noted.
+
+---
+
+### 8.3. References
+
+- [`.editorconfig`](/.editorconfig)
+- [Building CoreCLR Guide](/docs/workflow/building/coreclr/README.md)
+- [Building and Running CoreCLR Tests](/docs/workflow/testing/coreclr/testing.md)
+- [Building Mono](/docs/workflow/building/mono/README.md)
+- [Running test suites using Mono](/docs/workflow/testing/mono/testing.md)
+- [Build Libraries](/docs/workflow/building/libraries/README.md)
+- [Testing Libraries](/docs/workflow/testing/libraries/testing.md)
+- [Build libraries for WebAssembly](/docs/workflow/building/libraries/webassembly-instructions.md)
+- [Testing Libraries on WebAssembly](/docs/workflow/testing/libraries/testing-wasm.md)
+- [Building and running host tests](/docs/workflow/testing/host/testing.md)

.github/policies/binaryformatter-migration.yml

@@ -19,7 +19,7 @@ configuration:
           - adamsitnik
           - bartonjs
           - jeffhandley
-          - terrajobst
+          - JeremyKuhne
           replyTemplate: >-
             Tagging subscribers to 'binaryformatter-migration': ${mentionees}
           assignMentionees: False