From f816ca592ea77fba96923a1e013a09779f76be02 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Wed, 25 Mar 2026 14:10:02 -0700 Subject: [PATCH 1/2] Clean up stale Ubuntu references in comments and docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - docker-compose.yml: remove obsolete version attribute from all three compose files (HttpStress, SslStress, EnterpriseTests) — the version key is ignored by docker compose v2 and only produces warnings - cross-building.md: update FreeBSD cross-build example from ubuntu-18.04-cross-freebsd-12 to current azurelinux-3.0 image - webassembly-instructions.md: replace stale Ubuntu 18.04 Dockerfile paths, image tags, and master branch references with current links Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../building/coreclr/cross-building.md | 2 +- .../libraries/webassembly-instructions.md | 35 ++----------------- .../EnterpriseTests/setup/docker-compose.yml | 2 -- .../StressTests/HttpStress/docker-compose.yml | 1 - .../StressTests/SslStress/docker-compose.yml | 1 - 5 files changed, 4 insertions(+), 37 deletions(-) diff --git a/docs/workflow/building/coreclr/cross-building.md b/docs/workflow/building/coreclr/cross-building.md index 28ea2f0ef118f1..3b4c5b77d30cbe 100644 --- a/docs/workflow/building/coreclr/cross-building.md +++ b/docs/workflow/building/coreclr/cross-building.md @@ -168,7 +168,7 @@ docker run --rm \ -v :/runtime \ -w /runtime \ -e ROOTFS_DIR=/crossrootfs/x64 \ - mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-12 \ + mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-freebsd-14-amd64 \ ./build.sh --subset clr --cross --os freebsd ``` diff --git a/docs/workflow/building/libraries/webassembly-instructions.md b/docs/workflow/building/libraries/webassembly-instructions.md index 162ddc57c0fc3f..d2329e358a1f00 100644 --- a/docs/workflow/building/libraries/webassembly-instructions.md +++ b/docs/workflow/building/libraries/webassembly-instructions.md @@ -119,40 +119,11 @@ L: GC_MAJOR: (user request) time 3.00ms, stw 3.00ms los size: 0K in use: 0K ## Updating Emscripten version in Docker image -First update emscripten version in the [webassembly Dockerfile](https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/master/src/ubuntu/18.04/webassembly/Dockerfile#L19). +First update the emscripten version in the [webassembly Dockerfile](https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/src/ubuntu/26.04/helix/webassembly/amd64/Dockerfile). -``` -ENV EMSCRIPTEN_VERSION=1.39.16 -``` - -Submit a PR request with the updated version, wait for all checks to pass and for the request to be merged. A [master.json file](https://github.com/dotnet/versions/blob/master/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-master.json#L1126) will be updated with the a new docker image. +Submit a PR request with the updated version, wait for all checks to pass and for the request to be merged. A [image-info.json file](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json) will be updated with the new docker image tag. -``` -{ - "platforms": [ - { - "dockerfile": "src/ubuntu/18.04/webassembly/Dockerfile", - "simpleTags": [ - "ubuntu-18.04-webassembly-20210707133424-12f133e" - ], - "digest": "sha256:1f2d920a70bd8d55bbb329e87c3bd732ef930d64ff288dab4af0aa700c25cfaf", - "osType": "Linux", - "osVersion": "Ubuntu 18.04", - "architecture": "amd64", - "created": "2020-05-29T22:16:52.5716294Z", - "commitUrl": "https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/6a6da637580ec557fd3708f86291f3ead2422697/src/ubuntu/18.04/webassembly/Dockerfile" - } - ] -}, -``` - -Copy the docker image tag and replace it in [platform-matrix.yml](https://github.com/dotnet/runtime/blob/main/eng/pipelines/common/platform-matrix.yml#L172) - -``` -container: - image: ubuntu-18.04-webassembly-20210707133424-12f133e - registry: mcr -``` +Copy the docker image tag and update the references in the runtime repo pipeline files (e.g., `eng/pipelines/helix-platforms.yml` and `eng/pipelines/libraries/helix-queues-setup.yml`). Open a PR request with the new image. diff --git a/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/docker-compose.yml b/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/docker-compose.yml index 0b524f35b381f1..24b61aa5c62fdb 100644 --- a/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/docker-compose.yml +++ b/src/libraries/Common/tests/System/Net/EnterpriseTests/setup/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: kdc: build: diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml index ddce0b945ea6fd..a42a0c72810d59 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' # Although the version attribute is obsolete and should be ignored, it's seemingly not the case on Build.Ubuntu.2204.Amd64.Open services: client: build: diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml b/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml index 4b71a04109b045..4c17d864726fff 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' # Although the version attribute is obsolete and should be ignored, it's seemingly not the case on Build.Ubuntu.2204.Amd64.Open services: client: build: From 5589cd18279d070307db39329463bb85ff817700 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Wed, 25 Mar 2026 15:58:17 -0700 Subject: [PATCH 2/2] Address review feedback on webassembly-instructions.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Link to 24.04 Dockerfile (current) instead of 26.04 (not yet in use) - Fix 'PR request' redundancy → 'PR' - Fix 'A image-info.json file' → 'The image-info manifest' Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../workflow/building/libraries/webassembly-instructions.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/workflow/building/libraries/webassembly-instructions.md b/docs/workflow/building/libraries/webassembly-instructions.md index d2329e358a1f00..87ebb3301fd000 100644 --- a/docs/workflow/building/libraries/webassembly-instructions.md +++ b/docs/workflow/building/libraries/webassembly-instructions.md @@ -119,13 +119,13 @@ L: GC_MAJOR: (user request) time 3.00ms, stw 3.00ms los size: 0K in use: 0K ## Updating Emscripten version in Docker image -First update the emscripten version in the [webassembly Dockerfile](https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/src/ubuntu/26.04/helix/webassembly/amd64/Dockerfile). +First update the emscripten version in the [webassembly Dockerfile](https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/src/ubuntu/24.04/helix/webassembly/amd64/Dockerfile). -Submit a PR request with the updated version, wait for all checks to pass and for the request to be merged. A [image-info.json file](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json) will be updated with the new docker image tag. +Submit a PR with the updated version, wait for all checks to pass and for it to be merged. The [image-info manifest](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json) will be updated with the new docker image tag. Copy the docker image tag and update the references in the runtime repo pipeline files (e.g., `eng/pipelines/helix-platforms.yml` and `eng/pipelines/libraries/helix-queues-setup.yml`). -Open a PR request with the new image. +Open a PR with the new image. # Test libraries