Skip to content

Add .NET Fx 4.8.1 Dockerfiles #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 13, 2022
Merged

Add .NET Fx 4.8.1 Dockerfiles #996

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64229d2
Add .NET Fx 4.8.1 Dockerfiles
mthalman May 26, 2022
8804c22
Fix targeting pack unit test
mthalman Aug 19, 2022
d030aca
Fix targeting pack unit test
mthalman Aug 19, 2022
0c1c27e
Merge branch 'main' into 4.8.1
mthalman Sep 13, 2022
183c536
Updates to correct the generated runtime Dockerfile
mthalman Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/releases/vs-tools-release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ _There is overlap between the tasks here and those for a [Patch Tuesday release]
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)
1. - [ ] Queue build of [dotnet-framework-docker pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=372) (internal MSFT link) with variables:

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

1. - [ ] Confirm images have been ingested by MCR
1. - [ ] Confirm READMEs have been updated in Docker Hub for [microsoft-dotnet-framework](https://hub.docker.com/_/microsoft-dotnet-framework)
Expand Down
5 changes: 4 additions & 1 deletion .mcr/portal/README.aspnet.portal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

## Featured Tags

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

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
Expand Down
5 changes: 4 additions & 1 deletion .mcr/portal/README.runtime.portal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

## Featured Tags

* `4.8.1`
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8.1`
* `4.8`
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8`
* `3.5`
Expand Down Expand Up @@ -44,7 +46,8 @@ docker run --rm mcr.microsoft.com/dotnet/framework/samples:dotnetapp

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
Expand Down
7 changes: 5 additions & 2 deletions .mcr/portal/README.sdk.portal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

## Featured Tags

* `4.8.1`
* `docker pull mcr.microsoft.com/dotnet/framework/sdk:4.8.1`
* `4.8`
* `docker pull mcr.microsoft.com/dotnet/framework/sdk:4.8`
* `3.5`
Expand Down Expand Up @@ -50,15 +52,16 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
4.8.1 | windowsservercore-ltsc2022 | 4.8.1*
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
4.6.2 | windowsservercore-ltsc2016 | 4.6.2
3.5 | windowsservercore-ltsc2019 | 4.7.2, 3.5, 3.0, 2.5
3.5 | windowsservercore-ltsc2016 | 4.6.2, 3.5, 3.0, 2.5

\* The 4.8 SDK is also capable of building 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.
\* 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.

## Support

Expand Down
5 changes: 4 additions & 1 deletion .mcr/portal/README.wcf.portal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

## Featured Tags

* `4.8.1`
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8.1`
* `4.8`
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8`

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

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
Expand Down
6 changes: 5 additions & 1 deletion README.aspnet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Featured Tags

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

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
Expand Down Expand Up @@ -65,6 +68,7 @@ Version Tag | OS Version | Supported .NET Versions
## Windows Server Core 2022 amd64 Tags
Tag | Dockerfile
---------| ---------------
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)
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)
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)

Expand Down
6 changes: 5 additions & 1 deletion README.runtime.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Featured Tags

* `4.8.1`
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8.1`
* `4.8`
* `docker pull mcr.microsoft.com/dotnet/framework/runtime:4.8`
* `3.5`
Expand Down Expand Up @@ -29,7 +31,8 @@ docker run --rm mcr.microsoft.com/dotnet/framework/samples:dotnetapp

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
Expand Down Expand Up @@ -57,6 +60,7 @@ Version Tag | OS Version | Supported .NET Versions
## Windows Server Core 2022 amd64 Tags
Tag | Dockerfile
---------| ---------------
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)
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)
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)

Expand Down
8 changes: 6 additions & 2 deletions README.sdk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Featured Tags

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

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
4.8.1 | windowsservercore-ltsc2022 | 4.8.1*
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8*
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
4.6.2 | windowsservercore-ltsc2016 | 4.6.2
3.5 | windowsservercore-ltsc2019 | 4.7.2, 3.5, 3.0, 2.5
3.5 | windowsservercore-ltsc2016 | 4.6.2, 3.5, 3.0, 2.5

\* The 4.8 SDK is also capable of building 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.
\* 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.

# Related Repos

Expand All @@ -65,6 +68,7 @@ Version Tag | OS Version | Supported .NET Versions
## Windows Server Core 2022 amd64 Tags
Tag | Dockerfile
---------| ---------------
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)
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)
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)

Expand Down
6 changes: 5 additions & 1 deletion README.wcf.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Featured Tags

* `4.8.1`
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8.1`
* `4.8`
* `docker pull mcr.microsoft.com/dotnet/framework/wcf:4.8`

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

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.8.1 | windowsservercore-ltsc2022 | 4.8.1
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
Expand All @@ -65,6 +68,7 @@ Version Tag | OS Version | Supported .NET Versions
## Windows Server Core 2022 amd64 Tags
Tag | Dockerfile
---------| ---------------
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)
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)

## Windows Server Core 2019 amd64 Tags
Expand Down
11 changes: 6 additions & 5 deletions eng/dockerfile-templates/runtime/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
set apply35Patch to (VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void && PRODUCT_VERSION = "3.5" && OS_VERSION_NUMBER != "ltsc2019") ^
set applyPatch to VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void &&
!(
PRODUCT_VERSION = "4.8.1" ||
(OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.7.2") ||
(
(
Expand All @@ -17,12 +18,12 @@
FROM mcr.microsoft.com/windows/servercore:{{OS_VERSION_NUMBER}}-amd64

ENV {{
if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8"
if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8" || PRODUCT_VERSION = "4.8.1"
:`
# Enable detection of running in a container
}}{{ if OS_VERSION_NUMBER != "ltsc2019"
:DOTNET_RUNNING_IN_CONTAINER=true `
}}{{ if PRODUCT_VERSION = "4.8":COMPLUS_RUNNING_IN_CONTAINER=1 `
}}{{ if PRODUCT_VERSION = "4.8" || PRODUCT_VERSION = "4.8.1":COMPLUS_RUNNING_IN_CONTAINER=1 `
}}COMPLUS_NGenProtectedProcess_FeatureEnabled=0

RUN `
Expand All @@ -35,8 +36,8 @@ RUN `
&& del microsoft-windows-netfx3-ondemand-package~31bf3856ad364e35~amd64~~.cab `
&& powershell Remove-Item -Force -Recurse ${Env:TEMP}\* `
`
^elif OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8"
: # Install .NET Fx 4.8
^elif (OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8") || PRODUCT_VERSION = "4.8.1"
: # Install .NET Fx {{PRODUCT_VERSION}}
curl -fSLo dotnet-framework-installer.exe {{VARIABLES[cat(PRODUCT_VERSION, "|url")]}} `
&& .\dotnet-framework-installer.exe /q `
&& del .\dotnet-framework-installer.exe `
Expand Down Expand Up @@ -70,7 +71,7 @@ else
: # ngen .NET Fx
{{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
: # Ngen top of assembly graph to optimize a set of frequently used assemblies
{{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" `
{{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" `
# To optimize 32-bit assemblies, uncomment the next line
# && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" `}}
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `
Expand Down
22 changes: 12 additions & 10 deletions eng/dockerfile-templates/sdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# escape=`
{{
set sdkVersion to when(PRODUCT_VERSION = "4.8.1", "4.8.1", "4.8")
}}# escape=`

ARG REPO=mcr.microsoft.com/dotnet/framework/runtime
FROM $REPO:{{PRODUCT_VERSION}}-{{VARIABLES[cat(PRODUCT_VERSION, "-", OS_VERSION_NUMBER, "-Runtime-DateStamp")]}}-{{OS_VERSION}}
Expand All @@ -15,18 +17,18 @@ ENV `
{{if OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "3.5"
:
RUN `
# Install .NET 4.8 Fx
curl -fSLo dotnet-framework-installer.exe {{VARIABLES["4.8|url"]}} `
# Install .NET {{sdkVersion}} Fx
curl -fSLo dotnet-framework-installer.exe {{VARIABLES[cat(sdkVersion, "|url")]}} `
&& .\dotnet-framework-installer.exe /q `
&& del .\dotnet-framework-installer.exe `
&& powershell Remove-Item -Force -Recurse ${Env:TEMP}\* `
`
# Apply latest patch
&& curl -fSLo patch.msu {{VARIABLES[cat("lcu|", OS_VERSION_NUMBER, "|4.8")]}} `
&& curl -fSLo patch.msu {{VARIABLES[cat("lcu|", OS_VERSION_NUMBER, "|", sdkVersion)]}} `
&& mkdir patch `
&& expand patch.msu patch -F:* `
&& del /F /Q patch.msu `
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|4.8")]}}-x64-ndp48.cab `
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", sdkVersion)]}}-x64-ndp48{{if PRODUCT_VERSION = "4.8.1":1}}.cab `
&& rmdir /S /Q patch `
`
# ngen .NET Fx
Expand All @@ -51,7 +53,7 @@ RUN `
&& 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.Net.Component.{{sdkVersion}}.SDK @^ `
--add Microsoft.NetCore.Component.Runtime.3.1 @^ `
--add Microsoft.NetCore.Component.Runtime.5.0 @^ `
--add Microsoft.NetCore.Component.Runtime.6.0 @^ `
Expand All @@ -68,8 +70,8 @@ RUN `
&& "%ProgramFiles%\dotnet\dotnet" help `
`
# Workaround for issues with 64-bit ngen
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen uninstall "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\SecAnnotate.exe" `
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen uninstall "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\WinMDExp.exe" `
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen uninstall "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v10.0A\bin\NETFX {{sdkVersion}} Tools\SecAnnotate.exe" `
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen uninstall "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v10.0A\bin\NETFX {{sdkVersion}} Tools\WinMDExp.exe" `
`
# ngen assemblies queued by VS installers
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `
Expand All @@ -87,14 +89,14 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles}\NuGet\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\amd64\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX {{sdkVersion}} Tools\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8') `
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
Expand Down
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/sdk/Dockerfile.ltsc2016
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8') `
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
Expand Down
1 change: 1 addition & 0 deletions eng/mcr-tags-metadata-templates/aspnet-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(McrTagsYmlRepo:aspnet)
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
Expand Down
1 change: 1 addition & 0 deletions eng/mcr-tags-metadata-templates/runtime-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(McrTagsYmlRepo:runtime)
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
Expand Down
1 change: 1 addition & 0 deletions eng/mcr-tags-metadata-templates/sdk-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(McrTagsYmlRepo:sdk)
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
Expand Down
1 change: 1 addition & 0 deletions eng/mcr-tags-metadata-templates/wcf-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(McrTagsYmlRepo:wcf)
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)
$(McrTagsYmlTagGroup:4.7.2-windowsservercore-ltsc2019)
Expand Down
4 changes: 3 additions & 1 deletion eng/readme-templates/FeaturedTags.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
* `docker pull mcr.microsoft.com/dotnet/framework/samples:wcfservice`
* `wcfclient`
* `docker pull mcr.microsoft.com/dotnet/framework/samples:wcfclient`^else
:* `4.8`
:* `4.8.1`
* `docker pull mcr.microsoft.com/dotnet/framework/{{SHORT_REPO}}:4.8.1`
* `4.8`
* `docker pull mcr.microsoft.com/dotnet/framework/{{SHORT_REPO}}:4.8`{{if SHORT_REPO != "wcf":
* `3.5`
* `docker pull mcr.microsoft.com/dotnet/framework/{{SHORT_REPO}}:3.5`}}}}
5 changes: 3 additions & 2 deletions eng/readme-templates/Use.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ if !IS_PRODUCT_FAMILY && SHORT_REPO != "samples":

Version Tag | OS Version | Supported .NET Versions
-- | -- | --
4.8 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8{{if SHORT_REPO = "sdk":*}}
4.8.1 | windowsservercore-ltsc2022 | 4.8.1{{if SHORT_REPO = "sdk":*}}
4.8 | windowsservercore-ltsc2022, windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.8{{if SHORT_REPO = "sdk":*}}
4.7.2 | windowsservercore-ltsc2019, windowsservercore-ltsc2016 | 4.7.2
4.7.1 | windowsservercore-ltsc2016 | 4.7.1
4.7 | windowsservercore-ltsc2016 | 4.7
4.6.2 | windowsservercore-ltsc2016 | 4.6.2{{if SHORT_REPO != "wcf":
3.5 | windowsservercore-ltsc2019 | 4.7.2, 3.5, 3.0, 2.5
3.5 | windowsservercore-ltsc2016 | 4.6.2, 3.5, 3.0, 2.5}}{{if SHORT_REPO = "sdk":

\* The 4.8 SDK is also capable of building 4.8, 4.7.2, 4.7.1, 4.7, and 4.6.2 projects.}}}}
\* 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.}}}}
Loading