Merge remote-tracking branch 'upstream/release/2026-03B' into release-2026-03B

Author: lbussell

README.aspnet.md

@@ -73,6 +73,6 @@ for more details on all of the supported options for publishing .NET apps.
 [`runtime-deps:10.0`]:                      https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/noble
 [`runtime-deps:10.0-noble-chiseled`]:       https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/noble-chiseled
 [`runtime-deps:10.0-noble-chiseled-extra`]: https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/noble-chiseled-extra
-[`aspnet:10.0-alpine`]:                     https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/10.0/alpine3.22
-[`runtime-deps:10.0-alpine`]:               https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/alpine3.22
-[`runtime-deps:10.0-alpine-extra`]:         https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/alpine3.22-extra
+[`aspnet:10.0-alpine`]:                     https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/10.0/alpine3.23
+[`runtime-deps:10.0-alpine`]:               https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/alpine3.23
+[`runtime-deps:10.0-alpine-extra`]:         https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/10.0/alpine3.23-extra

README.runtime-deps.md

@@ -195,7 +195,7 @@ Switching to a [supported base image tag](supported-tags.md) requires knowing th
 * If you're using an out-of-support .NET version, you must upgrade your project and Dockerfiles to target a supported version.
   The [.NET Support Policy](https://dotnet.microsoft.com/platform/support/policy) page contains the latest information on supported .NET versions.
 * If you're using a patch version tag which which has been replaced by a newer patch version, you must switch to the latest patch version.
-* If you're using a version-specific Alpine Linux tag for a version of Alpine that is no longer being maintained via .NET container images, you must move to the latest version. For example, `10.0-alpine3.21` => `10.0-alpine3.22`
+* If you're using a version-specific Alpine Linux tag for a version of Alpine that is no longer being maintained via .NET container images, you must move to the latest version. For example, `10.0-alpine3.22` => `10.0-alpine3.23`
 * If you're using a tag for a specific Windows version that is no longer supported, you must move to a supported version of Windows.
 
 See our [supported tag policy](supported-tags.md) for more information.

README.runtime.md

@@ -46,7 +46,8 @@
       Public stable builds still use build versions for paths but stable versions for filenames.
       Public unstable builds use build versions for both paths and filenames. ^
     set isStableVersion to find(buildVersion, "alpha") < 0 && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
-    set fileVersion to when(isStableVersion, productVersion, buildVersion) ^
+    set useFinalVersion to VARIABLES[cat(baseUrlType, "|", dotnetVersion, "|use-final-version")] = "true" ^
+    set fileVersion to when(isStableVersion, productVersion, when(useFinalVersion, cat(productVersion, ".final"), buildVersion)) ^
 
     set archiveExtension to when(isWindows, ".zip", ".tar.gz") ^
 
@@ -155,6 +156,16 @@
             "dotnet_build_version")),
         buildVersion
     )^_
+}}}}{{if (useFinalVersion && !isStableVersion):{{lineEnd}}
+{{continue}}{{
+    assign(
+        when(product = "aspnet" || product = "aspnet-composite",
+            "aspnetcore_file_version",
+        when(product = "sdk",
+            "dotnet_sdk_file_version",
+            "dotnet_file_version")),
+        fileVersion
+    )^_
 }}}}{{if runtimeVersion:{{lineEnd}}
 {{continue}}{{
     assign("dotnet_version", runtimeVersion)

README.sdk.md

@@ -9,13 +9,20 @@
         && find(buildVersion, "preview") < 0
         && find(buildVersion, "rc.") < 0 ^
 
+    set useFinalVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|use-final-version")] = "true" ^
+    set productVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")] ^
+
     set runtimeVersion to when(isStableBranding,
-        VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
-        VARIABLES[cat("runtime|", dotnetVersion, "|build-version")]) ^
+        productVersion,
+        when(useFinalVersion,
+            cat(productVersion, ".final"),
+            VARIABLES[cat("runtime|", dotnetVersion, "|build-version")])) ^
 
     set aspnetVersion to when(isStableBranding,
-        VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
-        VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")]) ^
+        productVersion,
+        when(useFinalVersion,
+            cat(productVersion, ".final"),
+            VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")])) ^
 
     set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^
     set lineContinuation to when(isWindows, "`", "\") ^

documentation/sample-image-size-report.md

@@ -8,9 +8,12 @@
         find(buildVersion, "alpha") < 0
         && find(buildVersion, "preview") < 0
         && find(buildVersion, "rc.") < 0 ^
+    set useFinalVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|use-final-version")] = "true" ^
     set runtimeVersion to when(isStableBranding,
         VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
-        buildVersion)
+        when(useFinalVersion,
+            cat(VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], ".final"),
+            buildVersion))
 
 }}# .NET Runtime version
 {{if ARGS["is-standalone"]:ENV }}DOTNET_VERSION={{runtimeVersion}}

documentation/vulnerability-reporting.md

@@ -9,9 +9,12 @@
         && find(buildVersion, "preview") < 0
         && find(buildVersion, "rc.") < 0 ^
 
+    set useFinalVersion to VARIABLES[cat("sdk|", dotnetVersion, "|use-final-version")] = "true" ^
     set sdkVersion to when(isStableBranding,
         VARIABLES[cat("sdk|", dotnetVersion, "|product-version")],
-        VARIABLES[cat("sdk|", dotnetVersion, "|build-version")]) ^
+        when(useFinalVersion,
+            cat(VARIABLES[cat("sdk|", dotnetVersion, "|product-version")], ".final"),
+            VARIABLES[cat("sdk|", dotnetVersion, "|build-version")])) ^
     set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
     set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^
     set lineContinuation to when(isWindows, "`", "\") ^