.NET 12 retargeting follow-up cleanups

.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'

Directory.Build.props

@@ -105,7 +105,7 @@
     <NetFrameworkToolCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <NetFrameworkCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
 
-    <ApiCompatNetCoreAppBaselineVersion>11.0.0-rc.1.26425.128</ApiCompatNetCoreAppBaselineVersion>
+    <ApiCompatNetCoreAppBaselineVersion>11.0.0-rc.3.26522.148</ApiCompatNetCoreAppBaselineVersion>
     <ApiCompatNetCoreAppBaselineTFM>net11.0</ApiCompatNetCoreAppBaselineTFM>
   </PropertyGroup>
 

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,42 +31,42 @@ 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`.
 
 After setting up dotnet you can verify you are using the current preview version by executing `dotnet --info`. Here is an example output:
 ```
 >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
 <packageSources>
-    <add key="dotnet11" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet11/nuget/v3/index.json" />
+    <add key="dotnet12" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet12/nuget/v3/index.json" />
     ...
 </packageSources>
 ```

docs/workflow/building/coreclr/cross-building.md

@@ -157,7 +157,7 @@ docker run --rm \
   -v <RUNTIME_REPO_PATH>:/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_REPO_PATH>:/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
 ```
 

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_REPO_PATH>:/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_REPO_PATH>:/runtime`: Mount the runtime repo clone located in `<RUNTIME_REPO_PATH>` 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.

eng/Versions.props

@@ -9,7 +9,7 @@
     <MajorVersion>12</MajorVersion>
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PackageVersionNet11>11.0.0-rc.1.26425.128</PackageVersionNet11>
+    <PackageVersionNet11>11.0.0-rc.3.26522.148</PackageVersionNet11>
     <PackageVersionNet10>10.0.0</PackageVersionNet10>
     <PackageVersionNet9>9.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet10)').Build),12))</PackageVersionNet9>
     <PackageVersionNet8>8.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet9)').Build),11))</PackageVersionNet8>