diff --git a/README.aspnet.md b/README.aspnet.md index ff536a13..acbefac1 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -96,12 +96,12 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile) -4.7.2-20250211-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile) -4.7.1-20250211-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile) -4.7-20250211-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile) -4.6.2-20250211-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile) -3.5-20250211-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile) +4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile) +4.7.2-20250311-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile) +4.7.1-20250311-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile) +4.7-20250311-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile) +4.6.2-20250311-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile) +3.5-20250311-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile) *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). diff --git a/README.runtime.md b/README.runtime.md index b9028b55..8239d806 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -87,12 +87,12 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2016/Dockerfile) -4.7.2-20250211-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile) -4.7.1-20250211-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile) -4.7-20250211-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile) -4.6.2-20250211-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/runtime/4.6.2/windowsservercore-ltsc2016/Dockerfile) -3.5-20250211-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile) +4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2016/Dockerfile) +4.7.2-20250311-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile) +4.7.1-20250311-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile) +4.7-20250311-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile) +4.6.2-20250311-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/runtime/4.6.2/windowsservercore-ltsc2016/Dockerfile) +3.5-20250311-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile) *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). diff --git a/README.sdk.md b/README.sdk.md index 1af2c5ff..dc8244b2 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -72,30 +72,30 @@ Version Tag | OS Version | Supported .NET Versions Tag | Dockerfile ---------| --------------- -4.8.1-20250211-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile) -3.5-20250211-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile) +4.8.1-20250311-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile) +3.5-20250311-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile) ### Windows Server Core 2022 amd64 Tags Tag | Dockerfile ---------| --------------- -4.8.1-20250211-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile) -4.8-20250211-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile) -3.5-20250211-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile) +4.8.1-20250311-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile) +4.8-20250311-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile) +3.5-20250311-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile) ### Windows Server Core 2019 amd64 Tags Tag | Dockerfile ---------| --------------- -4.8-20250211-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile) -3.5-20250211-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile) +4.8-20250311-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile) +3.5-20250311-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile) ### Windows Server Core 2016 amd64 Tags Tag | Dockerfile ---------| --------------- -4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile) -3.5-20250211-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile) +4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile) +3.5-20250311-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile) *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). diff --git a/README.wcf.md b/README.wcf.md index 54430395..2bcdbfc4 100644 --- a/README.wcf.md +++ b/README.wcf.md @@ -92,11 +92,11 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile) -4.7.2-20250211-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile) -4.7.1-20250211-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile) -4.7-20250211-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile) -4.6.2-20250211-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile) +4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile) +4.7.2-20250311-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile) +4.7.1-20250311-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile) +4.7-20250311-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile) +4.6.2-20250311-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile) *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). diff --git a/eng/dockerfile-templates/sdk/Dockerfile b/eng/dockerfile-templates/sdk/Dockerfile index b356d4c6..4e823a1f 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile +++ b/eng/dockerfile-templates/sdk/Dockerfile @@ -48,22 +48,7 @@ RUN ` && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" ` && del vs_TestAgent.exe ` ` - # Install VS Build Tools - && curl -fSLo vs_BuildTools.exe {{VARIABLES["vs|buildToolsUrl"]}} ` - && start /w vs_BuildTools @^ ` - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" @^ ` - --add Microsoft.Component.ClickOnce.MSBuild @^ ` - --add Microsoft.Net.Component.{{sdkVersion}}.SDK @^ ` - --add Microsoft.NetCore.Component.Runtime.8.0 @^ ` - --add Microsoft.NetCore.Component.Runtime.9.0 @^ ` - --add Microsoft.NetCore.Component.SDK @^ ` - --add Microsoft.VisualStudio.Component.NuGet.BuildTools @^ ` - --add Microsoft.VisualStudio.Component.WebDeploy @^ ` - --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup @^ ` - --add Microsoft.VisualStudio.Workload.MSBuildTools @^ ` - --quiet --norestart --nocache --wait ` - && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" ` - && del vs_BuildTools.exe ` + {{InsertTemplate("Dockerfile.install-vs-buildtools", [], " ")}} ` # Trigger dotnet first run experience by running arbitrary cmd && "%ProgramFiles%\dotnet\dotnet" help ` diff --git a/eng/dockerfile-templates/sdk/Dockerfile.install-vs-buildtools b/eng/dockerfile-templates/sdk/Dockerfile.install-vs-buildtools new file mode 100644 index 00000000..41594f05 --- /dev/null +++ b/eng/dockerfile-templates/sdk/Dockerfile.install-vs-buildtools @@ -0,0 +1,32 @@ +{{ + + _ ARGS: + usePowerShell: whether to use PowerShell to download and remove files ^ + + set sdkVersion to when(PRODUCT_VERSION = "4.8.1", "4.8.1", "4.8") + +}}# Install VS Build Tools{{ +if ARGS.usePowerShell: +&& powershell -Command ` + $ProgressPreference = 'SilentlyContinue'; ` + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` + Invoke-WebRequest ` + -UseBasicParsing ` + -Uri {{VARIABLES["vs|buildToolsUrl"]}} ` + -OutFile vs_BuildTools.exe `^ +else: +&& curl -fSLo vs_BuildTools.exe {{VARIABLES["vs|buildToolsUrl"]}} `}} +&& start /w vs_BuildTools @^ ` + --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" @^ ` + --add Microsoft.Component.ClickOnce.MSBuild @^ ` + --add Microsoft.Net.Component.{{sdkVersion}}.SDK @^ ` + --add Microsoft.NetCore.Component.Runtime.8.0 @^ ` + --add Microsoft.NetCore.Component.Runtime.9.0 @^ ` + --add Microsoft.NetCore.Component.SDK @^ ` + --add Microsoft.VisualStudio.Component.NuGet.BuildTools @^ ` + --add Microsoft.VisualStudio.Component.WebDeploy @^ ` + --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup @^ ` + --add Microsoft.VisualStudio.Workload.MSBuildTools @^ ` + --quiet --norestart --nocache --wait ` +&& powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" ` +&& del vs_BuildTools.exe ` \ No newline at end of file diff --git a/eng/dockerfile-templates/sdk/Dockerfile.ltsc2016 b/eng/dockerfile-templates/sdk/Dockerfile.ltsc2016 index ea82d036..164e8a30 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.ltsc2016 +++ b/eng/dockerfile-templates/sdk/Dockerfile.ltsc2016 @@ -65,29 +65,7 @@ RUN ` && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" ` && del vs_TestAgent.exe ` ` - # Install VS Build Tools - && powershell -Command ` - $ProgressPreference = 'SilentlyContinue'; ` - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - Invoke-WebRequest ` - -UseBasicParsing ` - -Uri {{VARIABLES["vs|buildToolsUrl"]}} ` - -OutFile vs_BuildTools.exe ` - && start /w vs_BuildTools @^ ` - --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" @^ ` - --add Microsoft.Component.ClickOnce.MSBuild @^ ` - --add Microsoft.Net.Component.4.8.SDK @^ ` - --add Microsoft.NetCore.Component.Runtime.6.0 @^ ` - --add Microsoft.NetCore.Component.Runtime.8.0 @^ ` - --add Microsoft.NetCore.Component.Runtime.9.0 @^ ` - --add Microsoft.NetCore.Component.SDK @^ ` - --add Microsoft.VisualStudio.Component.NuGet.BuildTools @^ ` - --add Microsoft.VisualStudio.Component.WebDeploy @^ ` - --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup @^ ` - --add Microsoft.VisualStudio.Workload.MSBuildTools @^ ` - --quiet --norestart --nocache --wait ` - && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" ` - && del vs_BuildTools.exe ` + {{InsertTemplate("Dockerfile.install-vs-buildtools", [ "usePowerShell": "true" ], " ")}} ` # Trigger dotnet first run experience by running arbitrary cmd && "%ProgramFiles%\dotnet\dotnet" help ` diff --git a/manifest.datestamps.json b/manifest.datestamps.json index 983656dd..4281c514 100644 --- a/manifest.datestamps.json +++ b/manifest.datestamps.json @@ -1,18 +1,22 @@ { "variables": { - "PreviousReleaseDateStamp": "20250114", - "CurrentReleaseDateStamp": "20250211", + "1B-ReleaseDateStamp": "20250114", + "2B-ReleaseDateStamp": "20250211", + "3B-ReleaseDateStamp": "20250311", - "RuntimeReleaseDateStamp": "$(PreviousReleaseDateStamp)", - "AspnetReleaseDateStamp": "$(PreviousReleaseDateStamp)", - "WcfReleaseDateStamp": "$(PreviousReleaseDateStamp)", - "SdkReleaseDateStamp": "$(CurrentReleaseDateStamp)", - "2016-RuntimeReleaseDateStamp": "$(CurrentReleaseDateStamp)", - "2016-AspnetReleaseDateStamp": "$(CurrentReleaseDateStamp)", - "2016-WcfReleaseDateStamp": "$(CurrentReleaseDateStamp)", - "2025-RuntimeReleaseDateStamp": "$(CurrentReleaseDateStamp)", - "2025-AspnetReleaseDateStamp": "$(CurrentReleaseDateStamp)", - "2025-WcfReleaseDateStamp": "$(CurrentReleaseDateStamp)", + "RuntimeReleaseDateStamp": "$(1B-ReleaseDateStamp)", + "AspnetReleaseDateStamp": "$(1B-ReleaseDateStamp)", + "WcfReleaseDateStamp": "$(1B-ReleaseDateStamp)", + + "SdkReleaseDateStamp": "$(3B-ReleaseDateStamp)", + + "2016-RuntimeReleaseDateStamp": "$(3B-ReleaseDateStamp)", + "2016-AspnetReleaseDateStamp": "$(3B-ReleaseDateStamp)", + "2016-WcfReleaseDateStamp": "$(3B-ReleaseDateStamp)", + + "2025-RuntimeReleaseDateStamp": "$(2B-ReleaseDateStamp)", + "2025-AspnetReleaseDateStamp": "$(2B-ReleaseDateStamp)", + "2025-WcfReleaseDateStamp": "$(2B-ReleaseDateStamp)", "3.5-ltsc2016-Runtime-DateStamp": "$(2016-RuntimeReleaseDateStamp)", "3.5-ltsc2016-Aspnet-DateStamp": "$(2016-AspnetReleaseDateStamp)", diff --git a/manifest.versions.json b/manifest.versions.json index 2d8d1b51..b46b98d2 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -1,7 +1,7 @@ { "variables": { - "kb|ltsc2016|3.5": "KB5052006", - "lcu|ltsc2016|3.5": "https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/02/windows10.0-kb5052006-x64_426f068f41aef283b2581b941fb34b45855df223.msu", + "kb|ltsc2016|3.5": "KB5053594", + "lcu|ltsc2016|3.5": "https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/03/windows10.0-kb5053594-x64_d126a8ab63952fdac4b4de0672f75fe453c884d2.msu", "kb|ltsc2019|3.5": "KB5049608", "lcu|ltsc2019|3.5": "https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/12/windows10.0-kb5049608-x64_1a94518425035b7c11ccd554c89ae09752db511c.msu", "kb|ltsc2022|3.5": "KB5049617", @@ -40,7 +40,7 @@ "kb|ltsc2025|default": "$(kb|ltsc2025|4.8.1)", "lcu|ltsc2025|default": "$(lcu|ltsc2025|4.8.1)", - "nuget|version": "6.12.2", + "nuget|version": "6.13.2", "servicemonitor|version": "2.0.1.10", "servicemonitor|url": "https://dotnetbinaries.blob.core.windows.net/servicemonitor/$(servicemonitor|version)/ServiceMonitor.exe", diff --git a/src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile index 6a73090f..4bd0165a 100644 --- a/src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:3.5-20250211-windowsservercore-ltsc2016 +FROM $REPO:3.5-20250311-windowsservercore-ltsc2016 RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` diff --git a/src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile index 77019bfd..413bf48b 100644 --- a/src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:4.6.2-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.6.2-20250311-windowsservercore-ltsc2016 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile index bf16ea59..3c7dbb9f 100644 --- a/src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:4.7.1-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.7.1-20250311-windowsservercore-ltsc2016 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile index c3a685b3..fa9f6f46 100644 --- a/src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:4.7.2-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.7.2-20250311-windowsservercore-ltsc2016 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile index a4efd9b3..7057e74f 100644 --- a/src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:4.7-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.7-20250311-windowsservercore-ltsc2016 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile index 9d44b518..60dccdab 100644 --- a/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:4.8-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.8-20250311-windowsservercore-ltsc2016 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] diff --git a/src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile b/src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile index fb24c585..c684f0a1 100644 --- a/src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile +++ b/src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile @@ -26,12 +26,12 @@ RUN ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest ` -UseBasicParsing ` - -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/02/windows10.0-kb5052006-x64_426f068f41aef283b2581b941fb34b45855df223.msu ` + -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/03/windows10.0-kb5053594-x64_d126a8ab63952fdac4b4de0672f75fe453c884d2.msu ` -OutFile patch.msu; ` && mkdir patch ` && expand patch.msu patch -F:* ` && del patch.msu ` - && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5052006-x64.cab ` + && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5053594-x64.cab ` && rmdir /S /Q patch ` ` # ngen .NET Fx diff --git a/src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile b/src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile index 8be204e1..83d20c3c 100644 --- a/src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile +++ b/src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile @@ -23,12 +23,12 @@ RUN ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest ` -UseBasicParsing ` - -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/02/windows10.0-kb5052006-x64_426f068f41aef283b2581b941fb34b45855df223.msu ` + -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/03/windows10.0-kb5053594-x64_d126a8ab63952fdac4b4de0672f75fe453c884d2.msu ` -OutFile patch.msu; ` && mkdir patch ` && expand patch.msu patch -F:* ` && del patch.msu ` - && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5052006-x64.cab ` + && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5053594-x64.cab ` && rmdir /S /Q patch ` ` # ngen .NET Fx diff --git a/src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile b/src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile index 6ff71da4..e143c1bc 100644 --- a/src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile +++ b/src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile @@ -23,12 +23,12 @@ RUN ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest ` -UseBasicParsing ` - -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/02/windows10.0-kb5052006-x64_426f068f41aef283b2581b941fb34b45855df223.msu ` + -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/03/windows10.0-kb5053594-x64_d126a8ab63952fdac4b4de0672f75fe453c884d2.msu ` -OutFile patch.msu; ` && mkdir patch ` && expand patch.msu patch -F:* ` && del patch.msu ` - && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5052006-x64.cab ` + && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5053594-x64.cab ` && rmdir /S /Q patch ` ` # ngen .NET Fx diff --git a/src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile b/src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile index 42a8e6b1..33b75f75 100644 --- a/src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile +++ b/src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile @@ -23,12 +23,12 @@ RUN ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` Invoke-WebRequest ` -UseBasicParsing ` - -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/02/windows10.0-kb5052006-x64_426f068f41aef283b2581b941fb34b45855df223.msu ` + -Uri https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2025/03/windows10.0-kb5053594-x64_d126a8ab63952fdac4b4de0672f75fe453c884d2.msu ` -OutFile patch.msu; ` && mkdir patch ` && expand patch.msu patch -F:* ` && del patch.msu ` - && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5052006-x64.cab ` + && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-KB5053594-x64.cab ` && rmdir /S /Q patch ` ` # ngen .NET Fx diff --git a/src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile b/src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile index 6c036c45..05348eae 100644 --- a/src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile +++ b/src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:3.5-20250211-windowsservercore-ltsc2016 +FROM $REPO:3.5-20250311-windowsservercore-ltsc2016 RUN ` # Install .NET 4.8 Fx @@ -36,7 +36,7 @@ RUN ` && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen update # Install NuGet CLI -ENV NUGET_VERSION=6.12.2 +ENV NUGET_VERSION=6.13.2 RUN mkdir "%ProgramFiles%\NuGet\latest" ` && powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` @@ -76,7 +76,6 @@ RUN ` --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^ ` --add Microsoft.Component.ClickOnce.MSBuild ^ ` --add Microsoft.Net.Component.4.8.SDK ^ ` - --add Microsoft.NetCore.Component.Runtime.6.0 ^ ` --add Microsoft.NetCore.Component.Runtime.8.0 ^ ` --add Microsoft.NetCore.Component.Runtime.9.0 ^ ` --add Microsoft.NetCore.Component.SDK ^ ` diff --git a/src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile b/src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile index 2c20d5e8..8e2c62bd 100644 --- a/src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile +++ b/src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile @@ -7,7 +7,7 @@ ENV ` # Do not generate certificate DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile b/src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile index 8763cf4b..546fdf19 100644 --- a/src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile +++ b/src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile @@ -9,7 +9,7 @@ ENV ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile b/src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile index 9767d4d0..92a2fc86 100644 --- a/src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile +++ b/src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile @@ -9,7 +9,7 @@ ENV ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile b/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile index e43dbcb8..98811b90 100644 --- a/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile +++ b/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile @@ -9,7 +9,7 @@ ENV ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile b/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile index 94ce2b18..ca17a673 100644 --- a/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile +++ b/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile @@ -9,7 +9,7 @@ ENV ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile b/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile index 507e378b..3550fa1f 100644 --- a/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile +++ b/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile @@ -1,10 +1,10 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/runtime -FROM $REPO:4.8-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.8-20250311-windowsservercore-ltsc2016 # Install NuGet CLI -ENV NUGET_VERSION=6.12.2 +ENV NUGET_VERSION=6.13.2 RUN mkdir "%ProgramFiles%\NuGet\latest" ` && powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` @@ -44,7 +44,6 @@ RUN ` --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^ ` --add Microsoft.Component.ClickOnce.MSBuild ^ ` --add Microsoft.Net.Component.4.8.SDK ^ ` - --add Microsoft.NetCore.Component.Runtime.6.0 ^ ` --add Microsoft.NetCore.Component.Runtime.8.0 ^ ` --add Microsoft.NetCore.Component.Runtime.9.0 ^ ` --add Microsoft.NetCore.Component.SDK ^ ` diff --git a/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile b/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile index 14edc9d7..88157fac 100644 --- a/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile +++ b/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile @@ -7,7 +7,7 @@ ENV ` # Do not generate certificate DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile b/src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile index ad0abe10..23c87b42 100644 --- a/src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile +++ b/src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile @@ -9,7 +9,7 @@ ENV ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # NuGet version to install - NUGET_VERSION=6.12.2 ` + NUGET_VERSION=6.13.2 ` # Install location of Roslyn ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn" diff --git a/src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile b/src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile index 233235f7..1deb7b33 100644 --- a/src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile +++ b/src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/aspnet -FROM $REPO:4.6.2-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.6.2-20250311-windowsservercore-ltsc2016 # Install Windows components required for WCF service hosted on IIS RUN Add-WindowsFeature NET-WCF-TCP-Activation45; ` diff --git a/src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile b/src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile index 9ffaf79e..7140c602 100644 --- a/src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile +++ b/src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/aspnet -FROM $REPO:4.7.1-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.7.1-20250311-windowsservercore-ltsc2016 # Install Windows components required for WCF service hosted on IIS RUN Add-WindowsFeature NET-WCF-TCP-Activation45; ` diff --git a/src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile b/src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile index 9469fe52..cccdea0a 100644 --- a/src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile +++ b/src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/aspnet -FROM $REPO:4.7.2-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.7.2-20250311-windowsservercore-ltsc2016 # Install Windows components required for WCF service hosted on IIS RUN Add-WindowsFeature NET-WCF-TCP-Activation45; ` diff --git a/src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile b/src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile index 2e6799d4..410e4327 100644 --- a/src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile +++ b/src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/aspnet -FROM $REPO:4.7-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.7-20250311-windowsservercore-ltsc2016 # Install Windows components required for WCF service hosted on IIS RUN Add-WindowsFeature NET-WCF-TCP-Activation45; ` diff --git a/src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile b/src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile index 9773c6e4..ec32629d 100644 --- a/src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile +++ b/src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/framework/aspnet -FROM $REPO:4.8-20250211-windowsservercore-ltsc2016 +FROM $REPO:4.8-20250311-windowsservercore-ltsc2016 # Install Windows components required for WCF service hosted on IIS RUN Add-WindowsFeature NET-WCF-TCP-Activation45; `