Skip to content

Commit 4228d93

Browse files
committed
Apply patch on 4.8.1 Server 2025 Runtime Dockerfile
1 parent 32fa282 commit 4228d93

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

eng/dockerfile-templates/runtime/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
&& !isServer2025 ^
1919

2020
set applyPatch to kbExists
21-
&& !(isServer2025 && isNet481)
2221
&& !(isServer2019 && isNet472)
2322
&& !(
2423
(isServer2019 && isNet472) ||
@@ -100,7 +99,7 @@ else
10099
: # ngen .NET Fx
101100
{{if PRODUCT_VERSION != "4.7.2":&& }}%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen uninstall "Microsoft.Tpm.Commands, Version=10.0.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=amd64" `^ else
102101
: # Ngen top of assembly graph to optimize a set of frequently used assemblies
103-
{{if isNet35 || ((isNet48 && !is48SecurityRelease) || (isNet481 && !isServer2025)):&& }}%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
102+
{{if isNet35 || ((isNet48 && !is48SecurityRelease) || isNet481):&& }}%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
104103
# To optimize 32-bit assemblies, uncomment the next line
105104
# && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `}}
106105
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `

src/runtime/4.8.1/windowsservercore-ltsc2025/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@ ENV `
99
COMPLUS_NGenProtectedProcess_FeatureEnabled=0
1010

1111
RUN `
12+
# Apply latest patch
13+
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 `
14+
&& mkdir patch `
15+
&& expand patch.msu patch -F:* `
16+
&& del /F /Q patch.msu `
17+
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows11.0-KB5045934-x64-ndp481.cab `
18+
&& rmdir /S /Q patch `
19+
`
1220
# Ngen top of assembly graph to optimize a set of frequently used assemblies
13-
%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
21+
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
1422
# To optimize 32-bit assemblies, uncomment the next line
1523
# && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
1624
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `

0 commit comments

Comments
 (0)