diff --git a/.github/workflows/jit-format.yml b/.github/workflows/jit-format.yml index b3a57bea1a8403..07e329a28c6422 100644 --- a/.github/workflows/jit-format.yml +++ b/.github/workflows/jit-format.yml @@ -18,7 +18,7 @@ jobs: os: - name: linux image: ubuntu-latest - container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64 + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64 extension: '.sh' cross: '--cross' rootfs: '/crossrootfs/x64' diff --git a/Directory.Build.props b/Directory.Build.props index a06a4207db1ccd..1aaa43e5865cfc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -105,7 +105,7 @@ - 11.0.0-rc.1.26425.128 + 11.0.0-rc.3.26522.148 net11.0 diff --git a/docs/project/dogfooding.md b/docs/project/dogfooding.md index 267534364db8ca..3e89f7e4179f16 100644 --- a/docs/project/dogfooding.md +++ b/docs/project/dogfooding.md @@ -1,7 +1,7 @@ # Dogfooding daily builds of .NET This document provides the steps necessary to consume a latest development build of .NET runtime and SDK. -Example below is for 11.0. +Example below is for 12.0. ## Obtaining daily builds of NuGet packages @@ -14,14 +14,14 @@ dotnet new nugetconfig Next, add the package source to NuGet.Config with the [dotnet nuget add source](https://learn.microsoft.com/dotnet/core/tools/dotnet-nuget-add-source) command: ``` -dotnet nuget add source -n dotnet11 https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet11/nuget/v3/index.json +dotnet nuget add source -n dotnet12 https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet12/nuget/v3/index.json ``` Then, you will be able to add the latest prerelease version of the desired package to your project. -**Example:** To add version 11.0-alpha.1.24556.8 of the System.Data.OleDb package, use the [dotnet add package](https://learn.microsoft.com/dotnet/core/tools/dotnet-add-package) command: +**Example:** To add version 12.0.0-alpha.1.26528.120 of the System.Data.OleDb package, use the [dotnet add package](https://learn.microsoft.com/dotnet/core/tools/dotnet-add-package) command: ``` -dotnet add package System.Data.OleDb -v 11.0-alpha.1.24556.8 +dotnet add package System.Data.OleDb -v 12.0.0-alpha.1.26528.120 ``` To use daily builds of the entire runtime, follow the steps given in the rest of this document instead. @@ -31,12 +31,12 @@ To use daily builds of the entire runtime, follow the steps given in the rest of If you're using private Azure DevOps feeds for your projects, you might need to add the preview feed through the Azure-specific feed URI format, which is `azure-feed://organization/optionalProject/feed@view`. In this case, you can add the .NET development package feed as follows: ``` -azure-feed://dnceng/public/dotnet11@Local +azure-feed://dnceng/public/dotnet12@Local ``` ## Install prerequisites -1. Acquire the latest development .NET SDK by downloading and extracting a zip/tarball or using an installer from the [latest builds table in dotnet/sdk](https://github.com/dotnet/sdk#installing-the-sdk) (for example, https://aka.ms/dotnet/11.0/daily/dotnet-sdk-win-x64.zip). +1. Acquire the latest development .NET SDK by downloading and extracting a zip/tarball or using an installer from the [latest builds table in dotnet/sdk](https://github.com/dotnet/sdk#installing-the-sdk) (for example, https://aka.ms/dotnet/12.0/daily/dotnet-sdk-win-x64.zip). 2. If you are using a local copy of the dotnet CLI, take care that when you type `dotnet` you do not inadvertently pick up a different copy that you may have in your path. On Windows, for example, if you use a Command Prompt, a global copy may be in the path, so use the fully qualified path to your local `dotnet` (e.g. `C:\dotnet\dotnet.exe`). If you receive an error "error NETSDK1045: The current .NET SDK does not support targeting .NET 12.0." then you may be executing an older `dotnet`. @@ -44,29 +44,29 @@ After setting up dotnet you can verify you are using the current preview version ``` >dotnet --info .NET SDK: - Version: 11.0.100-alpha.1.24556.7 - Commit: fc127ac5a4 + Version: 12.0.100-alpha.1.26528.120 + Commit: bc397b207b Runtime Environment: OS Name: Windows OS Version: 10.0.22616 OS Platform: Windows RID: win-x64 - Base Path: C:\Program Files\dotnet\sdk\11.0.100-alpha.1.24556.7\ + Base Path: C:\Program Files\dotnet\sdk\12.0.100-alpha.1.26528.120\ global.json file: Not found Host: - Version: 12.0.0-alpha.1.24556.3 + Version: 12.0.0-alpha.1.26528.120 Architecture: x64 - Commit: 47d9c43ab1 + Commit: bc397b207b .NET SDKs installed: - 11.0.100-alpha.1.24556.7 [C:\Program Files\dotnet\sdk] + 12.0.100-alpha.1.26528.120 [C:\Program Files\dotnet\sdk] .NET runtimes installed: - Microsoft.NETCore.App 12.0.0-alpha.1.24556.7 [C:\Program Files\dotnet\shared\Microsoft.NETCore.App] + Microsoft.NETCore.App 12.0.0-alpha.1.26528.120 [C:\Program Files\dotnet\shared\Microsoft.NETCore.App] Download .NET: https://aka.ms/dotnet-download @@ -79,7 +79,7 @@ Learn about .NET Runtimes and SDKs: 3. Our daily builds are uploaded to development feed, not NuGet - so ensure the development feed is in your nuget configuration in case you need other packages that aren't included in the download. For example, on Windows you could edit `%userprofile%\appdata\roaming\nuget\nuget.config` or on Linux edit `~/.nuget/NuGet/NuGet.Config` to add these lines: ```xml - + ... ``` diff --git a/docs/workflow/building/coreclr/cross-building.md b/docs/workflow/building/coreclr/cross-building.md index 9d135750b7f5ff..919b08351eaecc 100644 --- a/docs/workflow/building/coreclr/cross-building.md +++ b/docs/workflow/building/coreclr/cross-building.md @@ -157,7 +157,7 @@ docker run --rm \ -v :/runtime \ -w /runtime \ -e ROOTFS_DIR=/crossrootfs/arm64 \ - mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm64 \ + mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm64 \ ./build.sh --subset clr --cross --arch arm64 ``` @@ -170,7 +170,7 @@ docker run --rm \ -v :/runtime \ -w /runtime \ -e ROOTFS_DIR=/crossrootfs/x64 \ - mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-freebsd-14-amd64 \ + mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-freebsd-14-amd64 \ ./build.sh --subset clr --cross --os freebsd ``` @@ -201,7 +201,7 @@ docker run --rm -it \ -v $(pwd):/runtime \ -w /runtime \ -e ROOTFS_DIR=/crossrootfs/arm64 \ - mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-freebsd-14-arm64 \ + mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-freebsd-14-arm64 \ bash ``` diff --git a/docs/workflow/using-docker.md b/docs/workflow/using-docker.md index b3f11a7fd2dbcd..2362ca78be0556 100644 --- a/docs/workflow/using-docker.md +++ b/docs/workflow/using-docker.md @@ -26,28 +26,28 @@ The main Docker images are the most commonly used ones, and the ones you will pr | Host OS | Target OS | Target Arch | Image | crossrootfs dir | | ----------------- | ------------ | --------------- | -------------------------------------------------------------------------------------- | -------------------- | -| Azure Linux (x64) | Alpine 3.17 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64-musl` | `/crossrootfs/x64` | -| Azure Linux (x64) | Ubuntu 18.04 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64` | `/crossrootfs/x64` | -| Azure Linux (x64) | Alpine 3.17 | Arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm-musl` | `/crossrootfs/arm` | -| Azure Linux (x64) | Ubuntu 22.04 | Arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm` | `/crossrootfs/arm` | -| Azure Linux (x64) | Alpine 3.17 | Arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm64-musl` | `/crossrootfs/arm64` | -| Azure Linux (x64) | Ubuntu 18.04 | Arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm64` | `/crossrootfs/arm64` | -| Azure Linux (x64) | Ubuntu 18.04 | x86 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-x86` | `/crossrootfs/x86` | +| Azure Linux (x64) | Alpine 3.17 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64-musl` | `/crossrootfs/x64` | +| Azure Linux (x64) | Ubuntu 18.04 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64` | `/crossrootfs/x64` | +| Azure Linux (x64) | Alpine 3.17 | Arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm-musl` | `/crossrootfs/arm` | +| Azure Linux (x64) | Ubuntu 22.04 | Arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm` | `/crossrootfs/arm` | +| Azure Linux (x64) | Alpine 3.17 | Arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm64-musl` | `/crossrootfs/arm64` | +| Azure Linux (x64) | Ubuntu 18.04 | Arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm64` | `/crossrootfs/arm64` | +| Azure Linux (x64) | Ubuntu 18.04 | x86 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-x86` | `/crossrootfs/x86` | **Extended Docker Images** | Host OS | Target OS | Target Arch | Image | crossrootfs dir | | ----------------- | -------------------------- | ------------- | --------------------------------------------------------------------------------------- | ---------------------- | -| Azure Linux (x64) | Android Bionic | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-android-amd64` | *N/A* | -| Azure Linux (x64) | Android Bionic (w/OpenSSL) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-android-openssl-amd64` | *N/A* | -| Azure Linux (x64) | Android Bionic (w/Docker) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-android-docker-amd64` | *N/A* | -| Azure Linux (x64) | FreeBSD 14 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-freebsd-14-amd64` | `/crossrootfs/x64` | -| Azure Linux (x64) | OpenBSD 7.9 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-openbsd-7.9-amd64` | `/crossrootfs/x64` | -| Azure Linux (x64) | Ubuntu 18.04 | PPC64le | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-ppc64le` | `/crossrootfs/ppc64le` | -| Azure Linux (x64) | Ubuntu 24.04 | RISC-V | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-riscv64` | `/crossrootfs/riscv64` | -| Azure Linux (x64) | Debian sid | LoongArch | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-loongarch64` | `/crossrootfs/loongarch64` | -| Azure Linux (x64) | Ubuntu 18.04 | S390x | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-s390x` | `/crossrootfs/s390x` | -| Azure Linux (x64) | Ubuntu 18.04 (Wasm) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-webassembly-amd64` | `/crossrootfs/x64` | +| Azure Linux (x64) | Android Bionic | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-android-amd64` | *N/A* | +| Azure Linux (x64) | Android Bionic (w/OpenSSL) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-android-openssl-amd64` | *N/A* | +| Azure Linux (x64) | Android Bionic (w/Docker) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-android-docker-amd64` | *N/A* | +| Azure Linux (x64) | FreeBSD 14 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-freebsd-14-amd64` | `/crossrootfs/x64` | +| Azure Linux (x64) | OpenBSD 7.9 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-openbsd-7.9-amd64` | `/crossrootfs/x64` | +| Azure Linux (x64) | Ubuntu 18.04 | PPC64le | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-ppc64le` | `/crossrootfs/ppc64le` | +| Azure Linux (x64) | Ubuntu 24.04 | RISC-V | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-riscv64` | `/crossrootfs/riscv64` | +| Azure Linux (x64) | Debian sid | LoongArch | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-loongarch64` | `/crossrootfs/loongarch64` | +| Azure Linux (x64) | Ubuntu 18.04 | S390x | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-s390x` | `/crossrootfs/s390x` | +| Azure Linux (x64) | Ubuntu 18.04 (Wasm) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-webassembly-amd64` | `/crossrootfs/x64` | | Debian (x64) | Debian 13 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-gcc16-amd64` | *N/A* | | Ubuntu (x64) | Tizen 9.0 | Arm32 (armel) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-armel-tizen` | `/crossrootfs/armel` | @@ -60,7 +60,7 @@ docker run --rm \ -v :/runtime \ -w /runtime \ -e ROOTFS_DIR=/crossrootfs/x64/ \ - mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64 \ + mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64 \ ./build.sh -s clr --cross -c Checked ``` @@ -70,7 +70,7 @@ Now, dissecting the command: - `-v :/runtime`: Mount the runtime repo clone located in `` to the container path `/runtime`. - `-w /runtime`: Start the container in the `/runtime` directory. - `-e ROOTFS_DIR=/crossrootfs/x64/` sets up the environment variable for crossbuilding. -- `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64`: The fully qualified name of the Docker image to download. In this case, we want to use an *Azure Linux* image to target the *x64* architecture. +- `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64`: The fully qualified name of the Docker image to download. In this case, we want to use an *Azure Linux* image to target the *x64* architecture. - `./build.sh -s clr --cross -c Checked`: The build command to run in the repo. In this case, we want to build the *Clr* subset in the *Checked* configuration with the cross compilation option. You might also want to interact with the container directly for a myriad of reasons, like running multiple builds in different paths for example. In this case, instead of passing the build script command to the `docker` command-line, pass the flag `-it`. When you do this, you will get access to a small shell within the container, which allows you to explore it, run builds manually, and so on, like you would on a regular terminal in your machine. Note that the containers' shell's built-in tools are very limited in comparison to the ones you probably have on your machine, so don't expect to be able to do full work there. diff --git a/eng/Versions.props b/eng/Versions.props index 0d9f31aa41f0ad..90934b61eb32b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 12 0 0 - 11.0.0-rc.1.26425.128 + 11.0.0-rc.3.26522.148 10.0.0 9.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet10)').Build),12)) 8.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet9)').Build),11)) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index 2f7bcd574f902c..12765abccf7862 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -17,49 +17,49 @@ extends: containers: linux_arm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm@sha256:df00ba4007ecc44dc480af9b7c1c55ae9aaa8c6ddc8d648bdba907a4ea1aaaf7 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm@sha256:7b28fbff664fd9ad563a4c96b5bda4e2b4492580cdc499df76b2735e01ca9886 env: ROOTFS_DIR: /crossrootfs/arm linux_arm64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm64@sha256:2e7394cb61a49043b85e315ba8a8a59a2c1081c13472aaea4b15a2f2dc8365b2 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm64@sha256:d9f37db22e6d43d24e15a5b8798a0ab0c4a359d8e73555af9f20a2af543e3a4e env: ROOTFS_DIR: /crossrootfs/arm64 linux_musl_x64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64-musl@sha256:bd1138cef68c85d059642f6e3358bd04709cd41bb9648c2b50deacc595e2e141 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64-musl@sha256:ae6cdff6100c9166344fb3317f7f0c21dde18957e366f8724119e960889efb80 env: ROOTFS_DIR: /crossrootfs/x64 linux_musl_arm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm-musl@sha256:83df076bca0b8286011b61efe1ff9b78a5ea91c92cc4dd5c9d9f1ab88273a25e + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm-musl@sha256:0098cee7d6527c90e003f610eb550085130510e685f18d3097949ab9c88f8ce1 env: ROOTFS_DIR: /crossrootfs/arm linux_musl_arm64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-arm64-musl@sha256:f150d6597f0761f379af03b9b5e63ebb24640890cee531ab771113f3d5165a1c + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-arm64-musl@sha256:8e53710642e6e58dc7f33d08921ed34b8f5ab5a321abcacb40b107f6fa4428e4 env: ROOTFS_DIR: /crossrootfs/arm64 # This container contains all required toolsets to build for Android and for Linux with bionic libc. android: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-android-amd64@sha256:d3731323cab2456f6b1ec8b7d3ef54c80eccdfe22ffb166382ed8f541f372222 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-android-amd64@sha256:492619d7e97ee490d731b26716e22cd911abe6932d9c853cdd411d6cc81e6412 # This container contains all required toolsets to build for Android and for Linux with bionic libc and a special layout of OpenSSL. linux_bionic: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-android-openssl-amd64@sha256:2aa7ca3a569297cabddb6d7f66a3c68d9c853c6f7e16aeaf152f4e0f3bc689be + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-android-openssl-amd64@sha256:b3c074e117c004b875357de34f69f257ee70f058008d8d3f599a4abd4a7e79ea # This container contains all required toolsets to build for Android as well as tooling to build docker images. android_docker: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-android-docker-amd64@sha256:2c3843494a1ce7fd9f950c7edea0a5e9b1f6ec5653dd533db59d5f07c95c1229 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-android-docker-amd64@sha256:dfb68e86ae79fc16c01eca86de49963653c685196c3fbec65f4db9cf12e21a6f linux_x64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64@sha256:0f169b636abd32b5d730a9be976148f8753752a99b695a419f55353e8bdc26b2 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64@sha256:b8606301f1a8708718349614cff3e126193796ef8806311d2026537076ac391c env: ROOTFS_DIR: /crossrootfs/x64 linux_x86: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-x86@sha256:04f264db1e649b4f77ae45584f30e4d7017dd736d8587349b14f70cd1a9dfeea + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-x86@sha256:85b85a82f4a7b5459351bb854630c927b0f73e4a0e39f96b60cabb2f1b77d508 env: ROOTFS_DIR: /crossrootfs/x86 @@ -70,7 +70,7 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.24-amd64@sha256:95e3b67b424b248f5289bbd809b2c7362e5c1e19efed370f3ed54611db5927bf linux_x64_sanitizer: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-amd64-sanitizer@sha256:ddd1413c484e2c506465883e7de989a2066bf09197d8b38d92665fd1f61f71d9 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-amd64-sanitizer@sha256:08a93ac1e91ecb180ac7e9acbb0d4f19f7dc99ed311e4824c6d535c864d46e0c env: ROOTFS_DIR: /crossrootfs/x64 @@ -83,22 +83,22 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-source-build-amd64@sha256:20442ed805d360a612d39b4ce0db89ce1eb0b60c67767d9ef0ff86b46f0c296c linux_s390x: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-s390x@sha256:0ee803862ab652c29b7b8eda3f97be24ed7d3c23a4fd853d6e35cbd57509bb2f + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-s390x@sha256:65152479d5931a9eeb13816e76f4e9a7a8a721fa42e11e4c2c84c56682f323f5 env: ROOTFS_DIR: /crossrootfs/s390x linux_ppc64le: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-ppc64le@sha256:0db66628ad535501df9ac8cb29a965f5f779d594721ecc9f226d6726e0ae5915 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-ppc64le@sha256:0661d03b2aabac900ca3c8357aadfc30dced6e62c581c111569616f09ecca339 env: ROOTFS_DIR: /crossrootfs/ppc64le linux_riscv64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-riscv64@sha256:88a50c9fe87c6dc27ec7679fd112e49e7f89f9085ce6e2a4b66c58d85780cb31 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-riscv64@sha256:13dd077b3deb32ef963bf4658cd67818874d390af228761cef0487eef99f6d65 env: ROOTFS_DIR: /crossrootfs/riscv64 linux_loongarch64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-loongarch64@sha256:49426e8e20e945eadb474b7841ffa525140b8d887f13c5d807a5afa857b10986 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-loongarch64@sha256:d00f5e9d200cbebd772c6391ff67c53e8f60ca5fe304b7628aa000dc2c3bdd9e env: ROOTFS_DIR: /crossrootfs/loongarch64 @@ -109,22 +109,22 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64@sha256:245767ec8e2766e126c467640028c33250efd72fe2a8e91238bf506478e60e63 browser_wasm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-webassembly-amd64@sha256:393e3c737878172bb24f06b39d41eb5f7cb4e9b435259a5f17ad4b4ec76fdfea + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-webassembly-amd64@sha256:bfc435a1649facef6e147f248a58ac8dbb37acfd9085c1b80e9ed7fa5d83fe38 env: ROOTFS_DIR: /crossrootfs/x64 wasi_wasm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-webassembly-amd64@sha256:393e3c737878172bb24f06b39d41eb5f7cb4e9b435259a5f17ad4b4ec76fdfea + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-webassembly-amd64@sha256:bfc435a1649facef6e147f248a58ac8dbb37acfd9085c1b80e9ed7fa5d83fe38 env: ROOTFS_DIR: /crossrootfs/x64 freebsd_x64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-freebsd-14-amd64@sha256:8e2d5cf4fccf672c24f59ccd01f66d85da2c4605784322a43a73b6cb6d2abe81 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-freebsd-14-amd64@sha256:3bc90ef62404a3cbe03aaac9dec34cf45d62e8b2cbfaa7db65ed82bab09bdf02 env: ROOTFS_DIR: /crossrootfs/x64 openbsd_x64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-cross-openbsd-7.9-amd64@sha256:ed1319f316e56fbf4f3c7c334f49b7d212ff7d312aeae33e871ad9772f8c2f84 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net12.0-cross-openbsd-7.9-amd64@sha256:1343ca6b564a52b6b3f156fe2a46a5766a0c235534e50e9ef35001b652711b4d env: ROOTFS_DIR: /crossrootfs/x64 diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 08ec30943c795a..24b891ce379126 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -7,12 +7,6 @@ $([MSBuild]::NormalizeDirectory($(ArtifactsDir), 'packages', $(Configuration), 'Shipping')) - - $(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 11.0 - $(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 11.0 - $(SdkBandVersionForWorkload_FromRuntimeVersions) diff --git a/src/coreclr/nativeaot/docs/compiling.md b/src/coreclr/nativeaot/docs/compiling.md index 02055bd1af7b6d..ccc19e416a0132 100644 --- a/src/coreclr/nativeaot/docs/compiling.md +++ b/src/coreclr/nativeaot/docs/compiling.md @@ -8,7 +8,7 @@ The rest of this document covers advanced topics only. For using daily builds, you need to make sure the `nuget.config` file for your project contains the following package sources under the `` element: ```xml - + ``` @@ -51,10 +51,10 @@ See [Building native AOT apps in containers](containers.md) for a streamlined pa For using daily builds according to the instructions above, in addition to the `Microsoft.DotNet.ILCompiler` package reference, also add the `runtime.win-x64.Microsoft.DotNet.ILCompiler` package reference to get the x64-hosted compiler: ```xml - + ``` -Replace `9.0.0-alpha.1.23456.7` with the latest version from the [dotnet11](https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet11/NuGet/Microsoft.DotNet.ILCompiler/) feed. +Replace `12.0.0-alpha.1.26528.120` with the latest version from the [dotnet12](https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet12/NuGet/Microsoft.DotNet.ILCompiler/) feed. Note that it is important to use _the same version_ for both packages to avoid potential hard-to-debug issues. After adding the package reference, you may publish for win-arm64 as usual: ```bash > dotnet publish -r win-arm64 @@ -62,7 +62,7 @@ Note that it is important to use _the same version_ for both packages to avoid p Similarly, to target linux-arm64 on a Linux x64 host, in addition to the `Microsoft.DotNet.ILCompiler` package reference, also add the `runtime.linux-x64.Microsoft.DotNet.ILCompiler` package reference to get the x64-hosted compiler: ```xml - + ``` ## Using statically linked ICU diff --git a/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj b/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj index 0642d3b28e01a0..b3281bb0f301e0 100644 --- a/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj +++ b/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj @@ -26,14 +26,6 @@ true - - - - - 11.0.0-rc.2.26478.114 - - - diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index 7c0c41ffda06ea..d042e9d4d20dde 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -3,14 +3,6 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) - - - - - 11.0.0-rc.2.26478.114 - - - diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index dfbed5f816dbde..b45323d15b8092 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -18,14 +18,6 @@ System.Security.Cryptography.Pkcs.EnvelopedCms false - - - - - 11.0.0-rc.2.26478.114 - - - true diff --git a/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs b/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs index 6182926e9904c0..0d2c01be6a0a58 100644 --- a/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/SatelliteAssembliesTests.cs @@ -91,22 +91,11 @@ public async Task ResourcesFromProjectReference(Configuration config, bool aot, Path.Combine(_projectDir, "..", "LibraryWithResources")); CreateProgramForCultureTest("LibraryWithResources.resx.words", "LibraryWithResources.Class1"); // move src/mono/wasm/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources to the test project - // The root D.B.props should be empty and D.B.targets should only patch the bootstrap SDK's net12 support. + // The root D.B.props should be empty and D.B.targets should use the non-Wasm targeting-pack setup. File.WriteAllText(Path.Combine(_projectDir, "..", "Directory.Build.props"), ""); - File.WriteAllText( - Path.Combine(_projectDir, "..", "Directory.Build.targets"), - """ - - - $(WBT_NETCOREAPP_MAXIMUM_VERSION) - - - - $(WORKLOAD_PACKS_VER) - - - - """); + File.Copy( + Path.Combine(BuildEnvironment.TestDataPath, "Local.Directory.Build.targets"), + Path.Combine(_projectDir, "..", "Directory.Build.targets")); // NativeFilesType dotnetWasmFileType = nativeRelink ? NativeFilesType.Relinked : aot ? NativeFilesType.AOT : NativeFilesType.FromRuntimePack; PublishProject(info, config, new PublishOptions(AOT: aot), isNativeBuild: nativeRelink); diff --git a/src/mono/wasm/testassets/BlazorBasicTestApp/R2rSuffixLibrary/R2rSuffixLibrary.csproj b/src/mono/wasm/testassets/BlazorBasicTestApp/R2rSuffixLibrary/R2rSuffixLibrary.csproj index 0d61c07c07f210..19c579b307805e 100644 --- a/src/mono/wasm/testassets/BlazorBasicTestApp/R2rSuffixLibrary/R2rSuffixLibrary.csproj +++ b/src/mono/wasm/testassets/BlazorBasicTestApp/R2rSuffixLibrary/R2rSuffixLibrary.csproj @@ -2,7 +2,7 @@ - net11.0 + net$(WBT_NETCOREAPP_MAXIMUM_VERSION) R2rSuffixLibrary.r2r diff --git a/src/native/eventpipe/ds-ipc-pal-socket.c b/src/native/eventpipe/ds-ipc-pal-socket.c index 544d39b19d33f1..2c09a28a97a9fa 100644 --- a/src/native/eventpipe/ds-ipc-pal-socket.c +++ b/src/native/eventpipe/ds-ipc-pal-socket.c @@ -312,7 +312,7 @@ ipc_socket_set_default_umask (void) { #if defined(DS_IPC_PAL_AF_UNIX) && (defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)) // This will set the default permission bit to 600 - return umask (~(S_IRUSR | S_IWUSR)); + return umask (~(S_IRUSR | S_IWUSR) & (S_IRWXU | S_IRWXG | S_IRWXO)); #else return 0; #endif diff --git a/src/native/external/llvm-libunwind-version.txt b/src/native/external/llvm-libunwind-version.txt index 1f2620f7dcd856..a595916b1ab602 100644 --- a/src/native/external/llvm-libunwind-version.txt +++ b/src/native/external/llvm-libunwind-version.txt @@ -2,3 +2,4 @@ v22.1.1 https://github.com/llvm/llvm-project/releases/tag/llvmorg-22.1.1 Apply https://github.com/dotnet/runtime/commit/f32dd3cca659e5f34def913f36a23da3ac984de6 +Apply https://github.com/llvm/llvm-project/commit/1f332ae4f1b33f82590fffb30922185e20a6eae2 diff --git a/src/native/external/llvm-libunwind/src/CompactUnwinder.hpp b/src/native/external/llvm-libunwind/src/CompactUnwinder.hpp index f6810af3e9f8d0..e3aa8bf26ce038 100644 --- a/src/native/external/llvm-libunwind/src/CompactUnwinder.hpp +++ b/src/native/external/llvm-libunwind/src/CompactUnwinder.hpp @@ -12,6 +12,7 @@ #ifndef __COMPACT_UNWINDER_HPP__ #define __COMPACT_UNWINDER_HPP__ +#include #include #include @@ -352,8 +353,8 @@ int CompactUnwinder_x86_64::stepWithCompactEncodingRBPFrame( default: (void)functionStart; _LIBUNWIND_DEBUG_LOG("bad register for RBP frame, encoding=%08X for " - "function starting at 0x%llX", - compactEncoding, functionStart); + "function starting at 0x%" PRIu64 "X", + compactEncoding, functionStart); _LIBUNWIND_ABORT("invalid compact unwind encoding"); } savedRegisters += 8; @@ -477,8 +478,8 @@ int CompactUnwinder_x86_64::stepWithCompactEncodingFrameless( break; default: _LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for " - "function starting at 0x%llX", - encoding, functionStart); + "function starting at 0x%" PRIu64 "X", + encoding, functionStart); _LIBUNWIND_ABORT("invalid compact unwind encoding"); } savedRegisters += 8;