Install 11B cumulative update

Author: lbussell

eng/dockerfile-templates/runtime/Dockerfile

@@ -12,7 +12,10 @@
     set kbExists to VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void ^
     set is48SecurityRelease to (VARIABLES[cat("4.8-is-security-release|", OS_VERSION_NUMBER)] = "true") ^
 
-    set apply35Patch to kbExists && isNet35 && !isServer2019 ^
+    set apply35Patch to kbExists && isNet35
+        && !isServer2019
+        && !isServer2025 ^
+
     set applyPatch to kbExists
         && !(isServer2025 && isNet481)
         && !(isServer2019 && isNet472)
@@ -27,6 +30,14 @@
                 )
             ) ^
 
+    set winver to when(
+        isServer2016 || isServer2019 || isServer2022,
+        "windows10.0",
+        "windows11.0") ^
+
+    _ set applyPatch to when(isServer2025, isServer2025, applyPatch) ^
+    _ set apply35Patch to when(isServer2025, !isServer2025, apply35Patch) ^
+
     set repo to "mcr.microsoft.com/windows/servercore" ^
     set tag to cat(OS_VERSION_NUMBER, "-amd64") ^
 
@@ -72,7 +83,7 @@ RUN `
     && mkdir patch `
     && expand patch.msu patch -F:* `
     && del /F /Q patch.msu `
-    && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)]}}-x64{{if OS_VERSION_NUMBER = "ltsc2022":-ndp48}}.cab `
+    && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)]}}-x64{{if OS_VERSION_NUMBER = "ltsc2022":-ndp48}}.cab `
     && rmdir /S /Q patch `
     `
 }}{{if applyPatch
@@ -81,7 +92,7 @@ RUN `
     && mkdir patch `
     && expand patch.msu patch -F:* `
     && del /F /Q patch.msu `
-    && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if PRODUCT_VERSION = "4.8.1":1}}.cab `
+    && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isServer2025 || isNet481:1}}.cab `
     && rmdir /S /Q patch `
     `
 }}{{if OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "3.5"

manifest.versions.json

@@ -6,18 +6,18 @@
       "lcu|ltsc2019|3.5": "https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/updt/2024/10/windows10.0-kb5046268-x64_cd2f14649df2343f1b4692c50644f22b863ed408.msu",
       "kb|ltsc2022|3.5": "KB5046265",
       "lcu|ltsc2022|3.5": "https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/updt/2024/10/windows10.0-kb5046265-x64-ndp48_cfcc472170dde9e73e2702f786f4f766864310e4.msu",
-      "kb|ltsc2025|3.5": "KB5046617",
-      "lcu|ltsc2025|3.5": "https://catalog.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/2b6cbd69-2d74-4f43-ad64-12f7fd0a9ce6/public/windows11.0-kb5046617-x64_1e5d7b716c0747592ae80c218f1d81bbb7b0c7ab.msu",
+      "kb|ltsc2025|3.5": "KB5045934",
+      "lcu|ltsc2025|3.5": "https://catalog.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/bbe78019-f312-48bc-9949-7392807d86c2/public/windows11.0-kb5045934-x64-ndp481_fa9c3adfb0532eb8f4e521f4fb92a179380184c5.msu",
 
       // All of these versions are patched by the same corresponding KB labeled as 3.5 above.
-      "kb|ltsc2019|4.7.2": "$(kb|ltsc2019|3.5)",
-      "lcu|ltsc2019|4.7.2": "$(lcu|ltsc2019|3.5)",
       "kb|ltsc2016|4.7.2": "$(kb|ltsc2016|3.5)",
       "lcu|ltsc2016|4.7.2": "$(lcu|ltsc2016|3.5)",
       "kb|ltsc2016|4.7.1": "$(kb|ltsc2016|3.5)",
       "lcu|ltsc2016|4.7.1": "$(lcu|ltsc2016|3.5)",
       "kb|ltsc2016|4.7": "$(kb|ltsc2016|3.5)",
       "lcu|ltsc2016|4.7": "$(lcu|ltsc2016|3.5)",
+      "kb|ltsc2019|4.7.2": "$(kb|ltsc2019|3.5)",
+      "lcu|ltsc2019|4.7.2": "$(lcu|ltsc2019|3.5)",
 
       "4.8-is-security-release": true,
       "4.8-is-security-release|ltsc2022": "$(4.8-is-security-release)",
@@ -29,12 +29,16 @@
       "lcu|ltsc2022|4.8": "$(lcu|ltsc2022|3.5)",
       "kb|ltsc2022|4.8.1": "kb5046264",
       "lcu|ltsc2022|4.8.1": "https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/updt/2024/10/windows10.0-kb5046264-x64-ndp481_1e80ccd86015f7fa036e2406579859e28beebdef.msu",
+      "kb|ltsc2025|4.8.1": "$(kb|ltsc2025|3.5)",
+      "lcu|ltsc2025|4.8.1": "$(lcu|ltsc2025|3.5)",
 
       // Defines the patch info for the default .NET Fx version installed in the OS
-      "kb|ltsc2022|default": "$(kb|ltsc2022|4.8)",
-      "lcu|ltsc2022|default": "$(lcu|ltsc2022|4.8)",
       "kb|ltsc2019|default": "$(kb|ltsc2019|4.7.2)",
       "lcu|ltsc2019|default": "$(lcu|ltsc2019|4.7.2)",
+      "kb|ltsc2022|default": "$(kb|ltsc2022|4.8)",
+      "lcu|ltsc2022|default": "$(lcu|ltsc2022|4.8)",
+      "kb|ltsc2025|default": "$(kb|ltsc2025|4.8.1)",
+      "lcu|ltsc2025|default": "$(lcu|ltsc2025|4.8.1)",
 
       "nuget|version": "6.11.1",
 

src/runtime/3.5/windowsservercore-ltsc2025/Dockerfile

@@ -16,6 +16,14 @@ RUN `
     && del microsoft-windows-netfx3-ondemand-package~31bf3856ad364e35~amd64~en-us~.cab `
     && powershell Remove-Item -Force -Recurse ${Env:TEMP}\* `
     `
+    # Apply latest patch
+    && curl -fSLo patch.msu https://catalog.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/bbe78019-f312-48bc-9949-7392807d86c2/public/windows11.0-kb5045934-x64-ndp481_fa9c3adfb0532eb8f4e521f4fb92a179380184c5.msu `
+    && mkdir patch `
+    && expand patch.msu patch -F:* `
+    && del /F /Q patch.msu `
+    && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows11.0-KB5045934-x64-ndp481.cab `
+    && rmdir /S /Q patch `
+    `
     # Ngen top of assembly graph to optimize a set of frequently used assemblies
     && %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
     # To optimize 32-bit assemblies, uncomment the next line