Skip to content

Commit eb7ea93

Browse files
authored
Merge branch 'main' into MSBUILD-dogfood
2 parents bfba89d + 3376cbd commit eb7ea93

File tree

4,030 files changed

+235215
-86223
lines changed

Some content is hidden

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

4,030 files changed

+235215
-86223
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "10.0.0-prerelease.25255.1",
18+
"version": "10.0.0-prerelease.25405.1",
1919
"commands": [
2020
"xharness"
2121
]

.devcontainer/android/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2828

2929
SHELL ["/bin/bash", "-c"]
3030

31-
ENV NDK_VER=r23c
32-
ENV SDK_VER=9123335_latest
33-
ENV SDK_API_LEVEL=33
34-
ENV SDK_BUILD_TOOLS=33.0.1
31+
ENV NDK_VER=r27c
32+
ENV SDK_VER=13114758_latest
33+
ENV SDK_API_LEVEL=35
34+
ENV SDK_BUILD_TOOLS=35.0.0
3535
ENV HOST_OS=linux
3636
ENV HOST_OS_SHORT=linux
3737
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
4343
curl -sSL --tlsv1.2 https://dl.google.com/android/repository/commandlinetools-${HOST_OS_SHORT}-${SDK_VER}.zip -L --output /tmp/asdk.zip
4444

4545
# Check hashes of downloads
46-
RUN (echo "6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242 /tmp/andk.zip"; echo "0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a /tmp/asdk.zip") | cat | sha256sum -c
46+
RUN (echo "59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc /tmp/andk.zip"; echo "7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee /tmp/asdk.zip") | cat | sha256sum -c
4747

4848
# Unpack the NDK and SDK
4949
RUN mkdir -p ${ANDROID_NDK_ROOT} && unzip /tmp/andk.zip -d $(dirname ${ANDROID_NDK_ROOT}) && rm -f /tmp/andk.zip && \

.devcontainer/scripts/onCreateCommand.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ case "$opt" in
3131

3232
android)
3333
# prebuild the repo for Mono, so it is ready for development
34-
./build.sh mono+libs -os android
34+
./build.sh mono+libs+clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages -os android
3535
# restore libs tests so that the project is ready to be loaded by OmniSharp
3636
./build.sh libs.tests -restore
3737
;;

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
22
# See https://help.github.com/articles/about-code-owners/
33

4-
/src/libraries/Common/src/Interop/ @dotnet/platform-deps-team
54
/src/libraries/Common/src/System/Net/Http/aspnetcore/ @dotnet/http
65
/src/libraries/Common/tests/Tests/System/Net/aspnetcore/ @dotnet/http
76

.github/copilot-instructions.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ In addition to the rules enforced by `.editorconfig`, you SHOULD:
3737
- [5.1. How To: Identify Affected Libraries](#51-how-to-identify-affected-libraries)
3838
- [5.2. How To: Build and Test Specific Library](#52-how-to-build-and-test-specific-library)
3939
- [6. WebAssembly (WASM) Libraries Workflow](#6-webassembly-wasm-libraries-workflow)
40-
- [7. Additional Notes](#7-additional-notes)
41-
- [7.1. Troubleshooting](#71-troubleshooting)
42-
- [7.2. Windows Command Equivalents](#72-windows-command-equivalents)
43-
- [7.3. References](#73-references)
40+
- [7. Host Workflow](#7-host-workflow)
41+
- [8. Additional Notes](#8-additional-notes)
42+
- [8.1. Troubleshooting](#81-troubleshooting)
43+
- [8.2. Windows Command Equivalents](#82-windows-command-equivalents)
44+
- [8.3. References](#83-references)
4445

4546
## 1. Prerequisites
4647

@@ -54,6 +55,7 @@ Identify which components will be impacted by the changes. If in doubt, analyze
5455
- **Mono Runtime:** Changes in `src/mono/`
5556
- **Libraries:** Changes in `src/libraries/`
5657
- **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).
58+
- **Host:** Changes in `src/native/corehost/`, `src/installer/managed/`, or `src/installer/tests/`
5759
- If none above apply, it is most possibly an infra-only or a docs-only change. Skip build and test steps.
5860

5961
**WASM/WASI Library Change Detection**
@@ -76,6 +78,7 @@ Before applying any changes, ensure you have a full successful build of the need
7678
- **Mono Runtime:** `./build.sh mono+libs`
7779
- **Libraries:** `./build.sh clr+libs -rc release`
7880
- **WASM/WASI Libraries:** `./build.sh mono+libs -os browser`
81+
- **Host:** `./build.sh clr+libs+host -rc release -lc release`
7982

8083
3. Verify the build completed without error.
8184
- _If the baseline build failed, report the failure and don't proceed with the changes._
@@ -239,9 +242,24 @@ From the repository root:
239242

240243
---
241244

242-
## 7. Additional Notes
245+
## 7. Host Workflow
243246

244-
### 7.1. Troubleshooting
247+
From the repository root:
248+
249+
- Build:
250+
`./build.sh host -rc release -lc release`
251+
252+
- Run all tests:
253+
`./build.sh host.tests -rc release -lc release -test`
254+
255+
- More info can be found in the dedicated workflow docs:
256+
- [Building and running host tests](/docs/workflow/testing/host/testing.md)
257+
258+
---
259+
260+
## 8. Additional Notes
261+
262+
### 8.1. Troubleshooting
245263

246264
- **Shared Framework Missing**
247265

@@ -273,15 +291,15 @@ From the repository root:
273291

274292
---
275293

276-
### 7.2. Windows Command Equivalents
294+
### 8.2. Windows Command Equivalents
277295

278296
- Use `build.cmd` instead of `build.sh` on Windows.
279297
- Set PATH: `set PATH=%CD%\.dotnet;%PATH%`
280298
- All other commands are similar unless otherwise noted.
281299

282300
---
283301

284-
### 7.3. References
302+
### 8.3. References
285303

286304
- [`.editorconfig`](/.editorconfig)
287305
- [Building CoreCLR Guide](/docs/workflow/building/coreclr/README.md)
@@ -292,3 +310,4 @@ From the repository root:
292310
- [Testing Libraries](/docs/workflow/testing/libraries/testing.md)
293311
- [Build libraries for WebAssembly](/docs/workflow/building/libraries/webassembly-instructions.md)
294312
- [Testing Libraries on WebAssembly](/docs/workflow/testing/libraries/testing-wasm.md)
313+
- [Building and running host tests](/docs/workflow/testing/host/testing.md)

.github/policies/binaryformatter-migration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ configuration:
1919
- adamsitnik
2020
- bartonjs
2121
- jeffhandley
22-
- terrajobst
22+
- JeremyKuhne
2323
replyTemplate: >-
2424
Tagging subscribers to 'binaryformatter-migration': ${mentionees}
2525
assignMentionees: False

.github/policies/resourceManagement.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,6 @@ configuration:
17891789
mentionees:
17901790
- vitek-karas
17911791
- kotlarmilos
1792-
- ivanpovazan
17931792
- steveisok
17941793
- akoeplinger
17951794
replyTemplate: >-
@@ -1828,7 +1827,6 @@ configuration:
18281827
mentionees:
18291828
- vitek-karas
18301829
- kotlarmilos
1831-
- ivanpovazan
18321830
- steveisok
18331831
- akoeplinger
18341832
replyTemplate: >-
@@ -1848,7 +1846,6 @@ configuration:
18481846
mentionees:
18491847
- vitek-karas
18501848
- kotlarmilos
1851-
- ivanpovazan
18521849
- steveisok
18531850
- akoeplinger
18541851
replyTemplate: >-

.github/workflows/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please make sure to include the @dotnet/runtime-infrastructure group as a review
66

77
For workflows that are triggered by pull requests, refer to GitHub's documentation for the `pull_request` and `pull_request_target` events. The `pull_request_target` event is the more common use case in this repository as it runs the workflow in the context of the target branch instead of in the context of the pull request's fork or branch. However, workflows that need to consume the contents of the pull request need to use the `pull_request` event. There are security considerations with each of the events though.
88

9-
Most workflows are intended to run only in the `dotnet/runtime` repository and not in forks. To force workflow jobs to be skipped in forks, each job should apply an `if` statement that checks the repository name or owner. Either approach works, but checking only the repository owner allows the workflow to run in copies or forks withing the dotnet org.
9+
Most workflows are intended to run only in the `dotnet/runtime` repository and not in forks. To force workflow jobs to be skipped in forks, each job should apply an `if` statement that checks the repository name or owner. Either approach works, but checking only the repository owner allows the workflow to run in copies or forks within the dotnet org.
1010

1111
```yaml
1212
jobs:

.github/workflows/aspnetcore-sync.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
runs-on: windows-latest
1717
steps:
1818
- name: Checkout aspnetcore
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
# Test this script using changes in a fork
2222
repository: 'dotnet/aspnetcore'
2323
path: aspnetcore
2424
ref: main
2525
- name: Checkout runtime
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
# Test this script using changes in a fork
2929
repository: 'dotnet/runtime'

.github/workflows/bump-chrome-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
- name: Setup Branch
2121
run: |
2222
git config user.name github-actions[bot]

0 commit comments

Comments
 (0)