Skip to content

Commit e813aec

Browse files
lbusselllbussell
authored
Merge branch 'main' into loganbussell/netfx3-wu
2 parents 6787a5f + 09fc85d commit e813aec

File tree

38 files changed

+118
-118
lines changed

38 files changed

+118
-118
lines changed

‎README.aspnet.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ Tag | Dockerfile
9696

9797
Tag | Dockerfile
9898
---------| ---------------
99-
4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile)
100-
4.7.2-20250211-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile)
101-
4.7.1-20250211-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile)
102-
4.7-20250211-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile)
103-
4.6.2-20250211-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile)
104-
3.5-20250211-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile)
99+
4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile)
100+
4.7.2-20250311-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile)
101+
4.7.1-20250311-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile)
102+
4.7-20250311-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile)
103+
4.6.2-20250311-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile)
104+
3.5-20250311-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile)
105105
<!--End of generated tags-->
106106

107107
*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).

‎README.runtime.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ Tag | Dockerfile
8787

8888
Tag | Dockerfile
8989
---------| ---------------
90-
4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2016/Dockerfile)
91-
4.7.2-20250211-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile)
92-
4.7.1-20250211-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile)
93-
4.7-20250211-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile)
94-
4.6.2-20250211-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/runtime/4.6.2/windowsservercore-ltsc2016/Dockerfile)
95-
3.5-20250211-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile)
90+
4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2016/Dockerfile)
91+
4.7.2-20250311-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile)
92+
4.7.1-20250311-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile)
93+
4.7-20250311-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile)
94+
4.6.2-20250311-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/runtime/4.6.2/windowsservercore-ltsc2016/Dockerfile)
95+
3.5-20250311-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile)
9696
<!--End of generated tags-->
9797

9898
*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).

‎README.sdk.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,30 +72,30 @@ Version Tag | OS Version | Supported .NET Versions
7272

7373
Tag | Dockerfile
7474
---------| ---------------
75-
4.8.1-20250211-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile)
76-
3.5-20250211-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile)
75+
4.8.1-20250311-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile)
76+
3.5-20250311-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile)
7777

7878
### Windows Server Core 2022 amd64 Tags
7979

8080
Tag | Dockerfile
8181
---------| ---------------
82-
4.8.1-20250211-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile)
83-
4.8-20250211-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile)
84-
3.5-20250211-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile)
82+
4.8.1-20250311-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile)
83+
4.8-20250311-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile)
84+
3.5-20250311-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile)
8585

8686
### Windows Server Core 2019 amd64 Tags
8787

8888
Tag | Dockerfile
8989
---------| ---------------
90-
4.8-20250211-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile)
91-
3.5-20250211-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile)
90+
4.8-20250311-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile)
91+
3.5-20250311-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile)
9292

9393
### Windows Server Core 2016 amd64 Tags
9494

9595
Tag | Dockerfile
9696
---------| ---------------
97-
4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile)
98-
3.5-20250211-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile)
97+
4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile)
98+
3.5-20250311-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile)
9999
<!--End of generated tags-->
100100

101101
*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).

‎README.wcf.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ Tag | Dockerfile
9292

9393
Tag | Dockerfile
9494
---------| ---------------
95-
4.8-20250211-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile)
96-
4.7.2-20250211-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile)
97-
4.7.1-20250211-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile)
98-
4.7-20250211-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile)
99-
4.6.2-20250211-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile)
95+
4.8-20250311-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile)
96+
4.7.2-20250311-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile)
97+
4.7.1-20250311-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile)
98+
4.7-20250311-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile)
99+
4.6.2-20250311-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile)
100100
<!--End of generated tags-->
101101

102102
*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).

‎eng/common/Install-DotNetSdk.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ $DotnetChannel = "9.0"
4545
$InstallFailed = $false
4646
if ($IsRunningOnUnix) {
4747
& chmod +x $DotnetInstallScriptPath
48-
& $DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath
48+
& "$PSScriptRoot/Invoke-WithRetry.ps1" "$DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath" -Retries 5
4949
$InstallFailed = ($LASTEXITCODE -ne 0)
5050
}
5151
else {
52-
& $DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath
52+
& "$PSScriptRoot/Invoke-WithRetry.ps1" "$DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath" -Retries 5
5353
$InstallFailed = (-not $?)
5454
}
5555

‎eng/common/templates/variables/docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2613921
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2660728
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

‎eng/dockerfile-templates/aspnet/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN dism /Online /Quiet /Enable-Feature /All /FeatureName:IIS-WebServerRole {{if
77
&& dism /Online /Quiet /Disable-Feature /FeatureName:IIS-WebServerManagementTools `
88
&& del /q "C:\inetpub\wwwroot\*" `
99
&& for /D %p IN ("C:\inetpub\wwwroot\*") DO rmdir "%p" /s /q `
10-
&& curl -fSLo ServiceMonitor.exe https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.10/ServiceMonitor.exe `
10+
&& curl -fSLo ServiceMonitor.exe {{VARIABLES["servicemonitor|url"]}} `
1111
{{if PRODUCT_VERSION = "3.5"
1212
: && %windir%\System32\inetsrv\appcmd set apppool /apppool.name:DefaultAppPool /managedRuntimeVersion:v2.0 `
1313
}} && %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `

‎eng/dockerfile-templates/aspnet/Dockerfile.3.5.pre20H2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN powershell -Command `
1111
Remove-Item -Recurse C:\inetpub\wwwroot\*; `
1212
{{if OS_VERSION_NUMBER = "ltsc2016"
1313
: [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
14-
}} Invoke-WebRequest -Uri https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.10/ServiceMonitor.exe -OutFile C:\ServiceMonitor.exe `
14+
}} Invoke-WebRequest -Uri {{VARIABLES["servicemonitor|url"]}} -OutFile C:\ServiceMonitor.exe `
1515
&& %windir%\System32\inetsrv\appcmd set apppool /apppool.name:DefaultAppPool /managedRuntimeVersion:v2.0 `
1616
{{if OS_VERSION_NUMBER = "ltsc2016" || OS_VERSION_NUMBER = "ltsc2019"
1717
: && %windir%\Microsoft.NET\Framework64\v2.0.50727\ngen update `

‎eng/dockerfile-templates/aspnet/Dockerfile.pre20H2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN Add-WindowsFeature Web-Server; `
1111
Remove-Item -Recurse C:\inetpub\wwwroot\*; `
1212
{{if OS_VERSION_NUMBER = "ltsc2016"
1313
: [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
14-
}} Invoke-WebRequest -Uri https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.10/ServiceMonitor.exe -OutFile C:\ServiceMonitor.exe; `
14+
}} Invoke-WebRequest -Uri {{VARIABLES["servicemonitor|url"]}} -OutFile C:\ServiceMonitor.exe; `
1515
&$Env:windir\Microsoft.NET\Framework64\v4.0.30319\ngen update; `
1616
&$Env:windir\Microsoft.NET\Framework\v4.0.30319\ngen update
1717

‎eng/dockerfile-templates/sdk/Dockerfile‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,7 @@ RUN `
4848
&& powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
4949
&& del vs_TestAgent.exe `
5050
`
51-
# Install VS Build Tools
52-
&& curl -fSLo vs_BuildTools.exe {{VARIABLES["vs|buildToolsUrl"]}} `
53-
&& start /w vs_BuildTools @^ `
54-
--installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" @^ `
55-
--add Microsoft.Component.ClickOnce.MSBuild @^ `
56-
--add Microsoft.Net.Component.{{sdkVersion}}.SDK @^ `
57-
--add Microsoft.NetCore.Component.Runtime.8.0 @^ `
58-
--add Microsoft.NetCore.Component.Runtime.9.0 @^ `
59-
--add Microsoft.NetCore.Component.SDK @^ `
60-
--add Microsoft.VisualStudio.Component.NuGet.BuildTools @^ `
61-
--add Microsoft.VisualStudio.Component.WebDeploy @^ `
62-
--add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup @^ `
63-
--add Microsoft.VisualStudio.Workload.MSBuildTools @^ `
64-
--quiet --norestart --nocache --wait `
65-
&& powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
66-
&& del vs_BuildTools.exe `
51+
{{InsertTemplate("Dockerfile.install-vs-buildtools", [], " ")}}
6752
`
6853
# Trigger dotnet first run experience by running arbitrary cmd
6954
&& "%ProgramFiles%\dotnet\dotnet" help `

0 commit comments

Comments
 (0)