Skip to content

Commit 950c9b5

Browse files
mthalmanmthalman
authored
Add .NET Fx 4.8.1 Dockerfiles (#996)
1 parent f6f716a commit 950c9b5

File tree

61 files changed

+924
-51
lines changed

Some content is hidden

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

61 files changed

+924
-51
lines changed

‎.github/ISSUE_TEMPLATE/releases/vs-tools-release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ _There is overlap between the tasks here and those for a [Patch Tuesday release]
2626
1. - [ ] Wait for changes to be mirrored to internal [dotnet-framework-docker repo](https://dev.azure.com/dnceng/internal/_git/Microsoft-dotnet-framework-docker) (internal MSFT link)
2727
1. - [ ] Queue build of [dotnet-framework-docker pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=372) (internal MSFT link) with variables:
2828

29-
imageBuilder.pathArgs: --path 'src/*/3.5/*' --path 'src/*/4.8/*'
29+
imageBuilder.pathArgs: --path 'src/*/3.5/*' --path 'src/*/4.8/*' --path 'src/*/4.8.1/*'
3030

3131
1. - [ ] Confirm images have been ingested by MCR
3232
1. - [ ] Confirm READMEs have been updated in Docker Hub for [microsoft-dotnet-framework](https://hub.docker.com/_/microsoft-dotnet-framework)

‎.mcr/portal/README.aspnet.portal.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
1313

1414
## Featured Tags
1515

16+
* `4.8.1`
17+
* `docker pull mcr.microsoft.com/dotnet/framework/aspnet:4.8.1`
1618
* `4.8`
1719
* `docker pull mcr.microsoft.com/dotnet/framework/aspnet:4.8`
1820
* `3.5`
@@ -52,7 +54,8 @@ After the application starts, navigate to `http://localhost:8000` in your web br
5254

5355
Version Tag | OS Version | Supported .NET Versions
5456
-- | -- | --
55-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
57+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
58+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
5659
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
5760
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
5861
4.7 | windowsservercore-ltsc2016 | 4.7

‎.mcr/portal/README.runtime.portal.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
66

77
## Featured Tags
88

9+
* `4.8.1`
10+
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8.1`
911
* `4.8`
1012
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8`
1113
* `3.5`
@@ -44,7 +46,8 @@ docker run --rm mcr.microsoft.com/dotnet/framework/samples:dotnetapp
4446

4547
Version Tag | OS Version | Supported .NET Versions
4648
-- | -- | --
47-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
49+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
50+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4851
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4952
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
5053
4.7 | windowsservercore-ltsc2016 | 4.7

‎.mcr/portal/README.sdk.portal.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
1515

1616
## Featured Tags
1717

18+
* `4.8.1`
19+
* `docker pull mcr.microsoft.com/dotnet/framework/sdk:4.8.1`
1820
* `4.8`
1921
* `docker pull mcr.microsoft.com/dotnet/framework/sdk:4.8`
2022
* `3.5`
@@ -50,15 +52,16 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor
5052

5153
Version Tag | OS Version | Supported .NET Versions
5254
-- | -- | --
53-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
55+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1*
56+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
5457
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
5558
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
5659
4.7 | windowsservercore-ltsc2016 | 4.7
5760
4.6.2 | windowsservercore-ltsc2016 | 4.6.2
5861
3.5 | windowsservercore-ltsc2019 | 4.7.2, 3.5, 3.0, 2.5
5962
3.5 | windowsservercore-ltsc2016 | 4.6.2, 3.5, 3.0, 2.5
6063

61-
\* The 4.8 SDK is also capable of building 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.
64+
\* The 4.8 and 4.8.1 SDKs are also capable of building 4.8.1, 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.
6265

6366
## Support
6467

‎.mcr/portal/README.wcf.portal.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
66

77
## Featured Tags
88

9+
* `4.8.1`
10+
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8.1`
911
* `4.8`
1012
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8`
1113

@@ -54,7 +56,8 @@ docker run --name wcfclientsample --rm -it -e HOST=172.26.236.119 mcr.microsoft.
5456

5557
Version Tag | OS Version | Supported .NET Versions
5658
-- | -- | --
57-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
59+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
60+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
5861
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
5962
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
6063
4.7 | windowsservercore-ltsc2016 | 4.7

‎README.aspnet.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Featured Tags
22

3+
* `4.8.1`
4+
* `docker pull mcr.microsoft.com/dotnet/framework/aspnet:4.8.1`
35
* `4.8`
46
* `docker pull mcr.microsoft.com/dotnet/framework/aspnet:4.8`
57
* `3.5`
@@ -37,7 +39,8 @@ After the application starts, navigate to `http://localhost:8000` in your web br
3739

3840
Version Tag | OS Version | Supported .NET Versions
3941
-- | -- | --
40-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
42+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
43+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4144
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4245
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4346
4.7 | windowsservercore-ltsc2016 | 4.7
@@ -65,6 +68,7 @@ Version Tag | OS Version | Supported .NET Versions
6568
## Windows Server Core 2022 amd64 Tags
6669
Tag | Dockerfile
6770
---------| ---------------
71+
4.8.1-20220809-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/aspnet/4.8.1/windowsservercore-ltsc2022/Dockerfile)
6872
4.8-20220809-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/aspnet/4.8/windowsservercore-ltsc2022/Dockerfile)
6973
3.5-20220809-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/aspnet/3.5/windowsservercore-ltsc2022/Dockerfile)
7074

‎README.runtime.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Featured Tags
22

3+
* `4.8.1`
4+
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8.1`
35
* `4.8`
46
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8`
57
* `3.5`
@@ -29,7 +31,8 @@ docker run --rm mcr.microsoft.com/dotnet/framework/samples:dotnetapp
2931

3032
Version Tag | OS Version | Supported .NET Versions
3133
-- | -- | --
32-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
34+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
35+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
3336
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
3437
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
3538
4.7 | windowsservercore-ltsc2016 | 4.7
@@ -57,6 +60,7 @@ Version Tag | OS Version | Supported .NET Versions
5760
## Windows Server Core 2022 amd64 Tags
5861
Tag | Dockerfile
5962
---------| ---------------
63+
4.8.1-20220809-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/runtime/4.8.1/windowsservercore-ltsc2022/Dockerfile)
6064
4.8-20220809-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/runtime/4.8/windowsservercore-ltsc2022/Dockerfile)
6165
3.5-20220809-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/runtime/3.5/windowsservercore-ltsc2022/Dockerfile)
6266

‎README.sdk.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Featured Tags
22

3+
* `4.8.1`
4+
* `docker pull mcr.microsoft.com/dotnet/framework/sdk:4.8.1`
35
* `4.8`
46
* `docker pull mcr.microsoft.com/dotnet/framework/sdk:4.8`
57
* `3.5`
@@ -35,15 +37,16 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor
3537

3638
Version Tag | OS Version | Supported .NET Versions
3739
-- | -- | --
38-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
40+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1*
41+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
3942
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4043
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4144
4.7 | windowsservercore-ltsc2016 | 4.7
4245
4.6.2 | windowsservercore-ltsc2016 | 4.6.2
4346
3.5 | windowsservercore-ltsc2019 | 4.7.2, 3.5, 3.0, 2.5
4447
3.5 | windowsservercore-ltsc2016 | 4.6.2, 3.5, 3.0, 2.5
4548

46-
\* The 4.8 SDK is also capable of building 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.
49+
\* The 4.8 and 4.8.1 SDKs are also capable of building 4.8.1, 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.
4750

4851
# Related Repos
4952

@@ -65,6 +68,7 @@ Version Tag | OS Version | Supported .NET Versions
6568
## Windows Server Core 2022 amd64 Tags
6669
Tag | Dockerfile
6770
---------| ---------------
71+
4.8.1-20220809-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile)
6872
4.8-20220809-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile)
6973
3.5-20220809-windowsservercore-ltsc2022, 3.5-windowsservercore-ltsc2022, 3.5 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile)
7074

‎README.wcf.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Featured Tags
22

3+
* `4.8.1`
4+
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8.1`
35
* `4.8`
46
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8`
57

@@ -39,7 +41,8 @@ docker run --name wcfclientsample --rm -it -e HOST=172.26.236.119 mcr.microsoft.
3941

4042
Version Tag | OS Version | Supported .NET Versions
4143
-- | -- | --
42-
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
44+
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
45+
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4346
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4447
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4548
4.7 | windowsservercore-ltsc2016 | 4.7
@@ -65,6 +68,7 @@ Version Tag | OS Version | Supported .NET Versions
6568
## Windows Server Core 2022 amd64 Tags
6669
Tag | Dockerfile
6770
---------| ---------------
71+
4.8.1-20220809-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/wcf/4.8.1/windowsservercore-ltsc2022/Dockerfile)
6872
4.8-20220809-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/main/src/wcf/4.8/windowsservercore-ltsc2022/Dockerfile)
6973

7074
## Windows Server Core 2019 amd64 Tags

‎eng/dockerfile-templates/runtime/Dockerfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set apply35Patch to (VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void && PRODUCT_VERSION = "3.5" && OS_VERSION_NUMBER != "ltsc2019") ^
44
set applyPatch to VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void &&
55
!(
6+
PRODUCT_VERSION = "4.8.1" ||
67
(OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.7.2") ||
78
(
89
(
@@ -17,12 +18,12 @@
1718
FROM mcr.microsoft.com/windows/servercore:{{OS_VERSION_NUMBER}}-amd64
1819

1920
ENV {{
20-
if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8"
21+
if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8" || PRODUCT_VERSION = "4.8.1"
2122
:`
2223
# Enable detection of running in a container
2324
}}{{ if OS_VERSION_NUMBER != "ltsc2019"
2425
:DOTNET_RUNNING_IN_CONTAINER=true `
25-
}}{{ if PRODUCT_VERSION = "4.8":COMPLUS_RUNNING_IN_CONTAINER=1 `
26+
}}{{ if PRODUCT_VERSION = "4.8" || PRODUCT_VERSION = "4.8.1":COMPLUS_RUNNING_IN_CONTAINER=1 `
2627
}}COMPLUS_NGenProtectedProcess_FeatureEnabled=0
2728

2829
RUN `
@@ -35,8 +36,8 @@ RUN `
3536
&& del microsoft-windows-netfx3-ondemand-package~31bf3856ad364e35~amd64~~.cab `
3637
&& powershell Remove-Item -Force -Recurse ${Env:TEMP}\* `
3738
`
38-
^elif OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8"
39-
: # Install .NET Fx 4.8
39+
^elif (OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8") || PRODUCT_VERSION = "4.8.1"
40+
: # Install .NET Fx {{PRODUCT_VERSION}}
4041
curl -fSLo dotnet-framework-installer.exe {{VARIABLES[cat(PRODUCT_VERSION, "|url")]}} `
4142
&& .\dotnet-framework-installer.exe /q `
4243
&& del .\dotnet-framework-installer.exe `
@@ -53,11 +54,11 @@ RUN `
5354
`
5455
}}{{if applyPatch
5556
: # Apply latest patch
56-
{{if PRODUCT_VERSION = "3.5" || (OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8"):&& }}curl -fSLo patch.msu {{VARIABLES[cat("lcu|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}} `
57+
{{if PRODUCT_VERSION = "3.5" || (OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8") || (OS_VERSION_NUMBER = "ltsc2022" && PRODUCT_VERSION = "4.8.1"):&& }}curl -fSLo patch.msu {{VARIABLES[cat("lcu|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}} `
5758
&& mkdir patch `
5859
&& expand patch.msu patch -F:* `
5960
&& del /F /Q patch.msu `
60-
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}.cab `
61+
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if PRODUCT_VERSION = "4.8.1":1}}.cab `
6162
&& rmdir /S /Q patch `
6263
`
6364
}}{{if OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "3.5"
@@ -70,7 +71,7 @@ else
7071
: # ngen .NET Fx
7172
{{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
7273
: # Ngen top of assembly graph to optimize a set of frequently used assemblies
73-
{{if PRODUCT_VERSION = "3.5" || (PRODUCT_VERSION = "4.8" && !is48SecurityRelease):&& }}%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
74+
{{if PRODUCT_VERSION = "3.5" || ((PRODUCT_VERSION = "4.8" && !is48SecurityRelease) || PRODUCT_VERSION = "4.8.1"):&& }}%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `
7475
# To optimize 32-bit assemblies, uncomment the next line
7576
# && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `}}
7677
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `

0 commit comments

Comments
 (0)