Skip to content

Commit 7e6e683

Browse files
lbusselllbussell
authored
Remove .NET Framework 3.5 images and consolidate 4.8 images (#1262)
1 parent 550ce76 commit 7e6e683

File tree

50 files changed

+63
-1869
lines changed

Some content is hidden

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

50 files changed

+63
-1869
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ indent_style = space
1212
indent_size = 4
1313
trim_trailing_whitespace = true
1414

15-
[project.json]
15+
[*.json]
1616
indent_size = 2
1717

1818
# C# files
@@ -187,4 +187,4 @@ indent_size = 2
187187
[*.sh]
188188
end_of_line = lf
189189
[*.{cmd, bat}]
190-
end_of_line = crlf
190+
end_of_line = crlf

‎README.aspnet.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,27 +75,18 @@ Tag | Dockerfile
7575
Tag | Dockerfile
7676
---------| ---------------
7777
4.8.1-20250909-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/aspnet/4.8.1/windowsservercore-ltsc2022/Dockerfile)
78-
4.8-20250909-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2022/Dockerfile)
79-
3.5-20250909-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2022/Dockerfile)
8078

8179
### Windows Server Core 2019 amd64 Tags
8280

8381
Tag | Dockerfile
8482
---------| ---------------
8583
4.8-20250909-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2019/Dockerfile)
86-
4.7.2-20250909-windowsservercore-ltsc2019, 4.7.2-windowsservercore-ltsc2019, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2019/Dockerfile)
87-
3.5-20250909-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2019/Dockerfile)
8884

8985
### Windows Server Core 2016 amd64 Tags
9086

9187
Tag | Dockerfile
9288
---------| ---------------
9389
4.8-20250909-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile)
94-
4.7.2-20250909-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/aspnet/4.7.2/windowsservercore-ltsc2016/Dockerfile)
95-
4.7.1-20250909-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/aspnet/4.7.1/windowsservercore-ltsc2016/Dockerfile)
96-
4.7-20250909-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/aspnet/4.7/windowsservercore-ltsc2016/Dockerfile)
97-
4.6.2-20250909-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/aspnet/4.6.2/windowsservercore-ltsc2016/Dockerfile)
98-
3.5-20250909-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2016/Dockerfile)
9990
<!--End of generated tags-->
10091

10192
*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: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,18 @@ Tag | Dockerfile
6666
Tag | Dockerfile
6767
---------| ---------------
6868
4.8.1-20250909-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/runtime/4.8.1/windowsservercore-ltsc2022/Dockerfile)
69-
4.8-20250909-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2022/Dockerfile)
70-
3.5-20250909-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2022/Dockerfile)
7169

7270
### Windows Server Core 2019 amd64 Tags
7371

7472
Tag | Dockerfile
7573
---------| ---------------
7674
4.8-20250909-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2019/Dockerfile)
77-
4.7.2-20250909-windowsservercore-ltsc2019, 4.7.2-windowsservercore-ltsc2019, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2019/Dockerfile)
78-
3.5-20250909-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2019/Dockerfile)
7975

8076
### Windows Server Core 2016 amd64 Tags
8177

8278
Tag | Dockerfile
8379
---------| ---------------
8480
4.8-20250909-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/runtime/4.8/windowsservercore-ltsc2016/Dockerfile)
85-
4.7.2-20250909-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/runtime/4.7.2/windowsservercore-ltsc2016/Dockerfile)
86-
4.7.1-20250909-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/runtime/4.7.1/windowsservercore-ltsc2016/Dockerfile)
87-
4.7-20250909-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/runtime/4.7/windowsservercore-ltsc2016/Dockerfile)
88-
4.6.2-20250909-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/runtime/4.6.2/windowsservercore-ltsc2016/Dockerfile)
89-
3.5-20250909-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2016/Dockerfile)
9081
<!--End of generated tags-->
9182

9283
*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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,18 @@ Tag | Dockerfile
7272
Tag | Dockerfile
7373
---------| ---------------
7474
4.8.1-20250909-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile)
75-
4.8-20250909-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile)
76-
3.5-20250909-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile)
7775

7876
### Windows Server Core 2019 amd64 Tags
7977

8078
Tag | Dockerfile
8179
---------| ---------------
8280
4.8-20250909-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile)
83-
3.5-20250909-windowsservercore-ltsc2019, 3.5-windowsservercore-ltsc2019, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile)
8481

8582
### Windows Server Core 2016 amd64 Tags
8683

8784
Tag | Dockerfile
8885
---------| ---------------
8986
4.8-20250909-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile)
90-
3.5-20250909-windowsservercore-ltsc2016, 3.5-windowsservercore-ltsc2016, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile)
9187
<!--End of generated tags-->
9288

9389
*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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,18 @@ Tag | Dockerfile
7777
Tag | Dockerfile
7878
---------| ---------------
7979
4.8.1-20250909-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/wcf/4.8.1/windowsservercore-ltsc2022/Dockerfile)
80-
4.8-20250909-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2022/Dockerfile)
8180

8281
### Windows Server Core 2019 amd64 Tags
8382

8483
Tag | Dockerfile
8584
---------| ---------------
8685
4.8-20250909-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2019/Dockerfile)
87-
4.7.2-20250909-windowsservercore-ltsc2019, 4.7.2-windowsservercore-ltsc2019, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2019/Dockerfile)
8886

8987
### Windows Server Core 2016 amd64 Tags
9088

9189
Tag | Dockerfile
9290
---------| ---------------
9391
4.8-20250909-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/wcf/4.8/windowsservercore-ltsc2016/Dockerfile)
94-
4.7.2-20250909-windowsservercore-ltsc2016, 4.7.2-windowsservercore-ltsc2016, 4.7.2 | [Dockerfile](src/wcf/4.7.2/windowsservercore-ltsc2016/Dockerfile)
95-
4.7.1-20250909-windowsservercore-ltsc2016, 4.7.1-windowsservercore-ltsc2016, 4.7.1 | [Dockerfile](src/wcf/4.7.1/windowsservercore-ltsc2016/Dockerfile)
96-
4.7-20250909-windowsservercore-ltsc2016, 4.7-windowsservercore-ltsc2016, 4.7 | [Dockerfile](src/wcf/4.7/windowsservercore-ltsc2016/Dockerfile)
97-
4.6.2-20250909-windowsservercore-ltsc2016, 4.6.2-windowsservercore-ltsc2016, 4.6.2 | [Dockerfile](src/wcf/4.6.2/windowsservercore-ltsc2016/Dockerfile)
9892
<!--End of generated tags-->
9993

10094
*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/mcr-tags-metadata-templates/aspnet-tags.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
$(McrTagsYmlRepo:aspnet)
22
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
33
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
4-
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
5-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)
64
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
7-
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2019)
8-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2019)
95
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2016)
10-
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2016)
11-
$(McrTagsYmlTagGroup:4.7.1-windowsservercore-ltsc2016)
12-
$(McrTagsYmlTagGroup:4.7-windowsservercore-ltsc2016)
13-
$(McrTagsYmlTagGroup:4.6.2-windowsservercore-ltsc2016)
14-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2016)

‎eng/mcr-tags-metadata-templates/runtime-tags.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
$(McrTagsYmlRepo:runtime)
22
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
33
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
4-
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
5-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)
64
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
7-
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2019)
8-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2019)
95
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2016)
10-
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2016)
11-
$(McrTagsYmlTagGroup:4.7.1-windowsservercore-ltsc2016)
12-
$(McrTagsYmlTagGroup:4.7-windowsservercore-ltsc2016)
13-
$(McrTagsYmlTagGroup:4.6.2-windowsservercore-ltsc2016)
14-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2016)

‎eng/mcr-tags-metadata-templates/sdk-tags.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
$(McrTagsYmlRepo:sdk)
22
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
33
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
4-
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
5-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)
64
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
7-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2019)
85
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2016)
9-
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2016)

‎eng/mcr-tags-metadata-templates/wcf-tags.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
$(McrTagsYmlRepo:wcf)
22
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
33
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
4-
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
54
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
6-
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2019)
75
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2016)
8-
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2016)
9-
$(McrTagsYmlTagGroup:4.7.1-windowsservercore-ltsc2016)
10-
$(McrTagsYmlTagGroup:4.7-windowsservercore-ltsc2016)
11-
$(McrTagsYmlTagGroup:4.6.2-windowsservercore-ltsc2016)

‎eng/pipelines/dotnet-framework-pr-no-cache.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ variables:
1919
- template: /eng/pipelines/variables/common.yml@self
2020
- name: manifest
2121
value: manifest.json
22+
- name: imageBuilder.pathArgs
23+
value: ""
24+
readonly: true
2225

2326
stages:
2427
- template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self

0 commit comments

Comments
 (0)