Skip to content

Commit 34e11d9

Browse files
lbusselllbussell
committed
Merge remote-tracking branch 'upstream/servicing' into server-2025
2 parents 6691140 + 53d1d57 commit 34e11d9

File tree

192 files changed

+115364
-22987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+115364
-22987
lines changed

‎CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
2+
# See https://help.github.com/articles/about-code-owners/
3+
4+
* @microsoft/dotnet-docker-contrib

‎README.aspnet.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ Tag | Dockerfile
9797
Tag | Dockerfile
9898
---------| ---------------
9999
4.8-20241112-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile)
100-
4.7.2-20241112-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile)
101-
4.7.1-20241112-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile)
102-
4.7-20241112-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile)
100+
4.7.2-20241210-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile)
101+
4.7.1-20241210-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile)
102+
4.7-20241210-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile)
103103
4.6.2-20241112-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile)
104-
3.5-20241112-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile)
104+
3.5-20241210-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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ Tag | Dockerfile
8888
Tag | Dockerfile
8989
---------| ---------------
9090
4.8-20241112-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2016/Dockerfile)
91-
4.7.2-20241112-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile)
92-
4.7.1-20241112-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile)
93-
4.7-20241112-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile)
91+
4.7.2-20241210-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile)
92+
4.7.1-20241210-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile)
93+
4.7-20241210-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile)
9494
4.6.2-20241112-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/runtime/4.6.2/windowsservercore-ltsc2016/Dockerfile)
95-
3.5-20241112-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile)
95+
3.5-20241210-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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Tag | Dockerfile
9595
Tag | Dockerfile
9696
---------| ---------------
9797
4.8-20241112-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile)
98-
3.5-20241112-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile)
98+
3.5-20241210-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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ Tag | Dockerfile
9393
Tag | Dockerfile
9494
---------| ---------------
9595
4.8-20241112-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile)
96-
4.7.2-20241112-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile)
97-
4.7.1-20241112-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile)
98-
4.7-20241112-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile)
96+
4.7.2-20241210-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile)
97+
4.7.1-20241210-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile)
98+
4.7-20241210-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile)
9999
4.6.2-20241112-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

‎eng/dockerfile-templates/sdk/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ RUN `
5454
--installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" @^ `
5555
--add Microsoft.Component.ClickOnce.MSBuild @^ `
5656
--add Microsoft.Net.Component.{{sdkVersion}}.SDK @^ `
57-
--add Microsoft.NetCore.Component.Runtime.6.0 @^ `
5857
--add Microsoft.NetCore.Component.Runtime.8.0 @^ `
5958
--add Microsoft.NetCore.Component.Runtime.9.0 @^ `
6059
--add Microsoft.NetCore.Component.SDK @^ `

‎manifest.datestamps.json‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
{
22
"variables": {
3-
"CurrentReleaseDateStamp": "20241112",
3+
"CurrentReleaseDateStamp": "20241210",
4+
"11B-ReleaseDateStamp": "20241112",
45
"ltsc2025-DateStamp": "20250106",
56

6-
"RuntimeReleaseDateStamp": "$(CurrentReleaseDateStamp)",
7-
"AspnetReleaseDateStamp": "$(CurrentReleaseDateStamp)",
8-
"WcfReleaseDateStamp": "$(CurrentReleaseDateStamp)",
9-
"SdkReleaseDateStamp": "$(CurrentReleaseDateStamp)",
7+
"RuntimeReleaseDateStamp": "$(11B-ReleaseDateStamp)",
8+
"AspnetReleaseDateStamp": "$(11B-ReleaseDateStamp)",
9+
"WcfReleaseDateStamp": "$(11B-ReleaseDateStamp)",
10+
"SdkReleaseDateStamp": "$(11B-ReleaseDateStamp)",
11+
"ltsc2016-RuntimeReleaseDateStamp": "$(CurrentReleaseDateStamp)",
12+
"ltsc2016-AspnetReleaseDateStamp": "$(CurrentReleaseDateStamp)",
13+
"ltsc2016-WcfReleaseDateStamp": "$(CurrentReleaseDateStamp)",
14+
"ltsc2016-SdkReleaseDateStamp": "$(CurrentReleaseDateStamp)",
1015
"ltsc2025-RuntimeReleaseDateStamp": "$(ltsc2025-DateStamp)",
1116
"ltsc2025-AspnetReleaseDateStamp": "$(ltsc2025-DateStamp)",
1217
"ltsc2025-WcfReleaseDateStamp": "$(ltsc2025-DateStamp)",
1318
"ltsc2025-SdkReleaseDateStamp": "$(ltsc2025-DateStamp)",
1419

15-
"3.5-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
16-
"3.5-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
17-
"3.5-ltsc2016-Sdk-DateStamp": "$(SdkReleaseDateStamp)",
20+
"3.5-ltsc2016-Runtime-DateStamp": "$(ltsc2016-RuntimeReleaseDateStamp)",
21+
"3.5-ltsc2016-Aspnet-DateStamp": "$(ltsc2016-AspnetReleaseDateStamp)",
22+
"3.5-ltsc2016-Sdk-DateStamp": "$(ltsc2016-SdkReleaseDateStamp)",
1823
"3.5-ltsc2019-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
1924
"3.5-ltsc2019-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
2025
"3.5-ltsc2019-Sdk-DateStamp": "$(SdkReleaseDateStamp)",
@@ -27,15 +32,15 @@
2732
"4.6.2-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
2833
"4.6.2-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
2934
"4.6.2-ltsc2016-Wcf-DateStamp": "$(WcfReleaseDateStamp)",
30-
"4.7-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
31-
"4.7-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
32-
"4.7-ltsc2016-Wcf-DateStamp": "$(WcfReleaseDateStamp)",
33-
"4.7.1-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
34-
"4.7.1-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
35-
"4.7.1-ltsc2016-Wcf-DateStamp": "$(WcfReleaseDateStamp)",
36-
"4.7.2-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
37-
"4.7.2-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
38-
"4.7.2-ltsc2016-Wcf-DateStamp": "$(WcfReleaseDateStamp)",
35+
"4.7-ltsc2016-Runtime-DateStamp": "$(ltsc2016-RuntimeReleaseDateStamp)",
36+
"4.7-ltsc2016-Aspnet-DateStamp": "$(ltsc2016-AspnetReleaseDateStamp)",
37+
"4.7-ltsc2016-Wcf-DateStamp": "$(ltsc2016-WcfReleaseDateStamp)",
38+
"4.7.1-ltsc2016-Runtime-DateStamp": "$(ltsc2016-RuntimeReleaseDateStamp)",
39+
"4.7.1-ltsc2016-Aspnet-DateStamp": "$(ltsc2016-AspnetReleaseDateStamp)",
40+
"4.7.1-ltsc2016-Wcf-DateStamp": "$(ltsc2016-WcfReleaseDateStamp)",
41+
"4.7.2-ltsc2016-Runtime-DateStamp": "$(ltsc2016-RuntimeReleaseDateStamp)",
42+
"4.7.2-ltsc2016-Aspnet-DateStamp": "$(ltsc2016-AspnetReleaseDateStamp)",
43+
"4.7.2-ltsc2016-Wcf-DateStamp": "$(ltsc2016-WcfReleaseDateStamp)",
3944
"4.7.2-ltsc2019-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
4045
"4.7.2-ltsc2019-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
4146
"4.7.2-ltsc2019-Wcf-DateStamp": "$(WcfReleaseDateStamp)",

‎manifest.versions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"variables": {
3-
"kb|ltsc2016|3.5": "kb5046612",
4-
"lcu|ltsc2016|3.5": "https://catalog.s.download.windowsupdate.com/c/msdownload/update/software/secu/2024/11/windows10.0-kb5046612-x64_b48845eca624ddb4c5210b72c3a70b5efa5d79ba.msu",
3+
"kb|ltsc2016|3.5": "kb5048671",
4+
"lcu|ltsc2016|3.5": "https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/secu/2024/12/windows10.0-kb5048671-x64_f1d285ea737f7eb10fb6b45f60876140522c0275.msu",
55
"kb|ltsc2019|3.5": "KB5046268",
66
"lcu|ltsc2019|3.5": "https://catalog.s.download.windowsupdate.com/d/msdownload/update/software/updt/2024/10/windows10.0-kb5046268-x64_cd2f14649df2343f1b4692c50644f22b863ed408.msu",
77
"kb|ltsc2022|3.5": "KB5046265",

‎samples/aspnetapp/aspnetapp.sln‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27428.2043
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35521.163 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aspnetapp", "aspnetapp\aspnetapp.csproj", "{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E8569ED5-912E-43BB-AD73-3B9DBB56EC52}"
9-
ProjectSection(SolutionItems) = preProject
10-
.dockerignore = .dockerignore
11-
deploy-container-to-aci.md = deploy-container-to-aci.md
12-
Dockerfile = Dockerfile
13-
Dockerfile.windowsservercore-ltsc2016 = Dockerfile.windowsservercore-ltsc2016
14-
README.md = README.md
15-
EndProjectSection
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aspnetapp", "aspnetapp\aspnetapp.csproj", "{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}"
167
EndProject
178
Global
189
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1910
Debug|Any CPU = Debug|Any CPU
2011
Release|Any CPU = Release|Any CPU
2112
EndGlobalSection
2213
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Release|Any CPU.ActiveCfg = Release|Any CPU
26-
{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Release|Any CPU.Build.0 = Release|Any CPU
2718
EndGlobalSection
2819
GlobalSection(SolutionProperties) = preSolution
2920
HideSolutionNode = FALSE
3021
EndGlobalSection
31-
GlobalSection(ExtensibilityGlobals) = postSolution
32-
SolutionGuid = {594D2B7F-0B98-470D-978A-0214E48CF075}
33-
EndGlobalSection
3422
EndGlobal

‎samples/aspnetapp/aspnetapp/About.aspx‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
<%@ Import Namespace="System.Runtime.InteropServices" %>
2+
23
<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="aspnetapp.About" %>
34

45
<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
5-
<h2><%: Title %>.</h2>
6-
<div align="center">
7-
<table class="table table-striped table-hover">
8-
<tr>
9-
<td>.NET version</td>
10-
<td><%= RuntimeInformation.FrameworkDescription %></td>
11-
</tr>
12-
<tr>
13-
<td>Operating system</td>
14-
<td><%= RuntimeInformation.OSDescription %></td>
15-
</tr>
16-
<tr>
17-
<td>Processor architecture</td>
18-
<td><%= RuntimeInformation.OSArchitecture %></td>
19-
</tr>
20-
<tr>
21-
<td>CPU cores</td>
22-
<td><%= Environment.ProcessorCount %></td>
23-
</tr>
24-
<tr>
25-
<td>DOTNET_RUNNING_IN_CONTAINER</td>
26-
<td><%= (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") is null ? "false" : "true") %></td>
27-
</tr>
28-
</table>
29-
</div>
6+
<main aria-labelledby="title">
7+
<h2 id="title"><%: Title %>.</h2>
8+
<div align="center">
9+
<table class="table table-striped table-hover">
10+
<tr>
11+
<td>.NET version</td>
12+
<td><%= RuntimeInformation.FrameworkDescription %></td>
13+
</tr>
14+
<tr>
15+
<td>Operating system</td>
16+
<td><%= RuntimeInformation.OSDescription %></td>
17+
</tr>
18+
<tr>
19+
<td>Processor architecture</td>
20+
<td><%= RuntimeInformation.OSArchitecture %></td>
21+
</tr>
22+
<tr>
23+
<td>CPU cores</td>
24+
<td><%= Environment.ProcessorCount %></td>
25+
</tr>
26+
<tr>
27+
<td>DOTNET_RUNNING_IN_CONTAINER</td>
28+
<td><%= (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") is null ? "false" : "true") %></td>
29+
</tr>
30+
</table>
31+
</div>
32+
</main>
3033
</asp:Content>

0 commit comments

Comments
 (0)