Skip to content

Commit d543f92

Browse files
Merge branch 'main' into fix-81500
2 parents a7a1487 + 0be0db2 commit d543f92

File tree

1,060 files changed

+37398
-11371
lines changed

Some content is hidden

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

1,060 files changed

+37398
-11371
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.25330.2",
18+
"version": "10.0.0-prerelease.25412.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/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]

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
# You can define any steps you want, and they will run before the agent starts.
1616
# If you do not check out your code, Copilot will do this for you.
1717
steps:
18-
- uses: actions/checkout@v4.2.2
18+
- uses: actions/checkout@v5
1919

2020
- name: Install Dependencies
2121
env:

.github/workflows/jit-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
dotnet-version: '8.0.x'
3535
- name: Checkout runtime
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
path: runtime
3939
- name: Install Python

.github/workflows/locker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: ${{ github.repository_owner == 'dotnet' }}
2424
steps:
2525
- name: Checkout Actions
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
repository: "microsoft/vscode-github-triage-actions"
2929
path: ./actions

.github/workflows/markdownlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Use Node.js
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 20.x
24+
node-version: 'lts/*'
2525
- name: Run Markdownlint
2626
run: |
2727
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"

docs/design/coreclr/botr/vectors-and-intrinsics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ For AOT compilation, the situation is far more complex. This is due to the follo
4040

4141
## Crossgen2 model of hardware intrinsic usage
4242
There are 2 sets of instruction sets known to the compiler.
43-
- The baseline instruction set which defaults to (Sse, Sse2), but may be adjusted via compiler option.
44-
- The optimistic instruction set which defaults to (Sse3, Ssse3, Sse41, Sse42, Popcnt, Pclmulqdq, and Lzcnt).
43+
- The baseline instruction set which defaults to x86-64-v2 (SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, and POPCNT), but may be adjusted via compiler option.
44+
- The optimistic instruction set which defaults to (AES, GFNI, SHA, WAITPKG, and X86SERIALIZE).
4545

4646
Code will be compiled using the optimistic instruction set to drive compilation, but any use of an instruction set beyond the baseline instruction set will be recorded, as will any attempt to use an instruction set beyond the optimistic set if that attempted use has a semantic effect. If the baseline instruction set includes `Avx2` then the size and characteristics of of `Vector<T>` is known. Any other decisions about ABI may also be encoded. For instance, it is likely that the ABI of `Vector256<T>` and `Vector512<T>` will vary based on the presence/absence of `Avx` support.
4747

0 commit comments

Comments
 (0)