Skip to content

Add .NET Framework 4.8 #270

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 7 commits into from
Apr 18, 2019
Merged

Add .NET Framework 4.8 #270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9c9020
Add .NET 4.8
MichaelSimons Apr 3, 2019
9b31387
more updates
mthalman Apr 18, 2019
1b49d9c
update sdk readme
mthalman Apr 18, 2019
1df753d
updates from code review
mthalman Apr 18, 2019
a5f8fee
reorder test matrix
mthalman Apr 18, 2019
e546299
update tags
mthalman Apr 18, 2019
af3f253
correct sdk base image reference
mthalman Apr 18, 2019
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
1 change: 0 additions & 1 deletion 3.5/sdk/windowsservercore-1803/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.c
Remove-Item -Force vs_buildtools.exe; `
Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Microsoft\VisualStudio\Packages\"; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"

# Install .NET 4.8 SDK
Expand Down
1 change: 0 additions & 1 deletion 3.5/sdk/windowsservercore-ltsc2016/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.c
Remove-Item -Force vs_buildtools.exe; `
Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Microsoft\VisualStudio\Packages\"; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"

# Install .NET 4.8 SDK
Expand Down
1 change: 0 additions & 1 deletion 3.5/sdk/windowsservercore-ltsc2019/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.c
Remove-Item -Force vs_buildtools.exe; `
Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Microsoft\VisualStudio\Packages\"; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"

# Install .NET 4.8 SDK
Expand Down
1 change: 0 additions & 1 deletion 4.8/sdk/windowsservercore-1803/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.c
Remove-Item -Force vs_buildtools.exe; `
Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Microsoft\VisualStudio\Packages\"; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"

# Install .NET 4.8 SDK
Expand Down
1 change: 0 additions & 1 deletion 4.8/sdk/windowsservercore-ltsc2016/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.c
Remove-Item -Force vs_buildtools.exe; `
Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Microsoft\VisualStudio\Packages\"; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"

# Install .NET 4.8 SDK
Expand Down
1 change: 0 additions & 1 deletion 4.8/sdk/windowsservercore-ltsc2019/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ RUN Invoke-WebRequest -UseBasicParsing https://download.visualstudio.microsoft.c
Remove-Item -Force vs_buildtools.exe; `
Remove-Item -Force -Recurse \"${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\*; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Microsoft\VisualStudio\Packages\"; `
Remove-Item -Force -Recurse \"${Env:ProgramData}\Package Cache\"

# Install .NET 4.8 SDK
Expand Down
18 changes: 9 additions & 9 deletions README.runtime.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@ docker run --rm mcr.microsoft.com/dotnet/framework/samples:dotnetapp
## Windows Server 2019 amd64 tags

- [`4.8-20190418-windowsservercore-ltsc2019`, `4.8-windowsservercore-ltsc2019`, `4.8` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.8/runtime/windowsservercore-ltsc2019/Dockerfile)
- [`4.7.2-20190418-windowsservercore-ltsc2019`, `4.7.2-windowsservercore-ltsc2019`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/runtime/windowsservercore-ltsc2019/Dockerfile)
- [`3.5-20190418-windowsservercore-ltsc2019`, `3.5-windowsservercore-ltsc2019`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/runtime/windowsservercore-ltsc2019/Dockerfile)
- [`4.7.2-20190409-windowsservercore-ltsc2019`, `4.7.2-windowsservercore-ltsc2019`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/runtime/windowsservercore-ltsc2019/Dockerfile)
- [`3.5-20190409-windowsservercore-ltsc2019`, `3.5-windowsservercore-ltsc2019`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/runtime/windowsservercore-ltsc2019/Dockerfile)

## Windows Server, version 1803 amd64 tags

- [`4.8-20190418-windowsservercore-1803`, `4.8-windowsservercore-1803`, `4.8` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.8/runtime/windowsservercore-1803/Dockerfile)
- [`4.7.2-20190418-windowsservercore-1803`, `4.7.2-windowsservercore-1803`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/runtime/windowsservercore-1803/Dockerfile)
- [`3.5-20190418-windowsservercore-1803`, `3.5-windowsservercore-1803`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/runtime/windowsservercore-1803/Dockerfile)
- [`4.7.2-20190409-windowsservercore-1803`, `4.7.2-windowsservercore-1803`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/runtime/windowsservercore-1803/Dockerfile)
- [`3.5-20190409-windowsservercore-1803`, `3.5-windowsservercore-1803`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/runtime/windowsservercore-1803/Dockerfile)

## Windows Server 2016 amd64 tags

- [`4.8-20190418-windowsservercore-ltsc2016`, `4.8-windowsservercore-ltsc2016`, `4.8` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.8/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.2-20190418-windowsservercore-ltsc2016`, `4.7.2-windowsservercore-ltsc2016`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.1-20190418-windowsservercore-ltsc2016`, `4.7.1-windowsservercore-ltsc2016`, `4.7.1` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.1/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.7-20190418-windowsservercore-ltsc2016`, `4.7-windowsservercore-ltsc2016`, `4.7` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.6.2-20190418-windowsservercore-ltsc2016`, `4.6.2-windowsservercore-ltsc2016`, `4.6.2` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.6.2/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`3.5-20190418-windowsservercore-ltsc2016`, `3.5-windowsservercore-ltsc2016`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.2-20190409-windowsservercore-ltsc2016`, `4.7.2-windowsservercore-ltsc2016`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.1-20190409-windowsservercore-ltsc2016`, `4.7.1-windowsservercore-ltsc2016`, `4.7.1` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.1/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.7-20190409-windowsservercore-ltsc2016`, `4.7-windowsservercore-ltsc2016`, `4.7` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`4.6.2-20190409-windowsservercore-ltsc2016`, `4.6.2-windowsservercore-ltsc2016`, `4.6.2` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.6.2/runtime/windowsservercore-ltsc2016/Dockerfile)
- [`3.5-20190409-windowsservercore-ltsc2016`, `3.5-windowsservercore-ltsc2016`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/runtime/windowsservercore-ltsc2016/Dockerfile)

For more information about these images and their history, please see [(`microsoft/dotnet-framework-docker`)](https://github.com/Microsoft/dotnet-framework-docker). These images are updated via [pull requests to the `Microsoft/dotnet-framework-docker` GitHub repo](https://github.com/Microsoft/dotnet-framework-docker/pulls).

Expand Down
8 changes: 4 additions & 4 deletions README.sdk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor
## Windows Server 2019 amd64 tags

- [`4.8-20190418-windowsservercore-ltsc2019`, `4.8-windowsservercore-ltsc2019`, `4.8` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.8/sdk/windowsservercore-ltsc2019/Dockerfile)
- [`4.7.2-20190418-windowsservercore-ltsc2019`, `4.7.2-windowsservercore-ltsc2019`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/sdk/windowsservercore-ltsc2019/Dockerfile)
- [`4.7.2-20190409-windowsservercore-ltsc2019`, `4.7.2-windowsservercore-ltsc2019`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/sdk/windowsservercore-ltsc2019/Dockerfile)
- [`3.5-20190418-windowsservercore-ltsc2019`, `3.5-windowsservercore-ltsc2019`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/sdk/windowsservercore-ltsc2019/Dockerfile)

## Windows Server, version 1803 amd64 tags

- [`4.8-20190418-windowsservercore-1803`, `4.8-windowsservercore-1803`, `4.8` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.8/sdk/windowsservercore-1803/Dockerfile)
- [`4.7.2-20190418-windowsservercore-1803`, `4.7.2-windowsservercore-1803`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/sdk/windowsservercore-1803/Dockerfile)
- [`4.7.2-20190409-windowsservercore-1803`, `4.7.2-windowsservercore-1803`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/sdk/windowsservercore-1803/Dockerfile)
- [`3.5-20190418-windowsservercore-1803`, `3.5-windowsservercore-1803`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/sdk/windowsservercore-1803/Dockerfile)

## Windows Server 2016 amd64 tags

- [`4.8-20190418-windowsservercore-ltsc2016`, `4.8-windowsservercore-ltsc2016`, `4.8` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.8/sdk/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.2-20190418-windowsservercore-ltsc2016`, `4.7.2-windowsservercore-ltsc2016`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/sdk/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.1-20190418-windowsservercore-ltsc2016`, `4.7.1-windowsservercore-ltsc2016`, `4.7.1` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.1/sdk/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.2-20190409-windowsservercore-ltsc2016`, `4.7.2-windowsservercore-ltsc2016`, `4.7.2`, `latest` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.2/sdk/windowsservercore-ltsc2016/Dockerfile)
- [`4.7.1-20190409-windowsservercore-ltsc2016`, `4.7.1-windowsservercore-ltsc2016`, `4.7.1` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/4.7.1/sdk/windowsservercore-ltsc2016/Dockerfile)
- [`3.5-20190418-windowsservercore-ltsc2016`, `3.5-windowsservercore-ltsc2016`, `3.5` (*Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker/blob/master/3.5/sdk/windowsservercore-ltsc2016/Dockerfile)

For more information about these images and their history, please see [(`microsoft/dotnet-framework-docker`)](https://github.com/Microsoft/dotnet-framework-docker). These images are updated via [pull requests to the `Microsoft/dotnet-framework-docker` GitHub repo](https://github.com/Microsoft/dotnet-framework-docker/pulls).
Expand Down
24 changes: 12 additions & 12 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"readmePath": "README.md",
"registry": "mcr.microsoft.com",
"variables": {
"RuntimeReleaseDateStamp": "20190418",
"SdkReleaseDateStamp": "20190418"
"RuntimeReleaseDateStamp": "20190409",
"SdkReleaseDateStamp": "20190409",
"48ReleaseDateStamp": "20190418"
},
"repos": [
{
Expand All @@ -21,7 +22,7 @@
"os": "windows",
"osVersion": "windowsservercore-1803",
"tags": {
"4.8-$(RuntimeReleaseDateStamp)-windowsservercore-1803": {},
"4.8-$(48ReleaseDateStamp)-windowsservercore-1803": {},
"4.8-windowsservercore-1803": {}
}
},
Expand All @@ -30,17 +31,16 @@
"os": "windows",
"osVersion": "windowsservercore-ltsc2016",
"tags": {
"4.8-$(RuntimeReleaseDateStamp)-windowsservercore-ltsc2016": {},
"4.8-$(48ReleaseDateStamp)-windowsservercore-ltsc2016": {},
"4.8-windowsservercore-ltsc2016": {}
}
},

{
"dockerfile": "4.8/runtime/windowsservercore-ltsc2019",
"os": "windows",
"osVersion": "windowsservercore-ltsc2019",
"tags": {
"4.8-$(RuntimeReleaseDateStamp)-windowsservercore-ltsc2019": {},
"4.8-$(48ReleaseDateStamp)-windowsservercore-ltsc2019": {},
"4.8-windowsservercore-ltsc2019": {}
}
}
Expand Down Expand Up @@ -183,7 +183,7 @@
"os": "windows",
"osVersion": "windowsservercore-1803",
"tags": {
"4.8-$(SdkReleaseDateStamp)-windowsservercore-1803": {},
"4.8-$(48ReleaseDateStamp)-windowsservercore-1803": {},
"4.8-windowsservercore-1803": {}
}
},
Expand All @@ -195,7 +195,7 @@
"os": "windows",
"osVersion": "windowsservercore-ltsc2016",
"tags": {
"4.8-$(SdkReleaseDateStamp)-windowsservercore-ltsc2016": {},
"4.8-$(48ReleaseDateStamp)-windowsservercore-ltsc2016": {},
"4.8-windowsservercore-ltsc2016": {}
}
},
Expand All @@ -207,7 +207,7 @@
"os": "windows",
"osVersion": "windowsservercore-ltsc2019",
"tags": {
"4.8-$(SdkReleaseDateStamp)-windowsservercore-ltsc2019": {},
"4.8-$(48ReleaseDateStamp)-windowsservercore-ltsc2019": {},
"4.8-windowsservercore-ltsc2019": {}
}
}
Expand Down Expand Up @@ -289,7 +289,7 @@
"os": "windows",
"osVersion": "windowsservercore-ltsc2016",
"tags": {
"3.5-$(SdkReleaseDateStamp)-windowsservercore-ltsc2016": {},
"3.5-$(48ReleaseDateStamp)-windowsservercore-ltsc2016": {},
"3.5-windowsservercore-ltsc2016": {}
}
},
Expand All @@ -301,7 +301,7 @@
"os": "windows",
"osVersion": "windowsservercore-1803",
"tags": {
"3.5-$(SdkReleaseDateStamp)-windowsservercore-1803": {},
"3.5-$(48ReleaseDateStamp)-windowsservercore-1803": {},
"3.5-windowsservercore-1803": {}
}
},
Expand All @@ -313,7 +313,7 @@
"os": "windows",
"osVersion": "windowsservercore-ltsc2019",
"tags": {
"3.5-$(SdkReleaseDateStamp)-windowsservercore-ltsc2019": {},
"3.5-$(48ReleaseDateStamp)-windowsservercore-ltsc2019": {},
"3.5-windowsservercore-ltsc2019": {}
}
}
Expand Down
4 changes: 4 additions & 0 deletions tests/Microsoft.DotNet.Framework.Docker.Tests/ImageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public class ImageTests
new ImageDescriptor { RuntimeVersion = "4.7.2", BuildVersion = "4.7.2", OsVariant = WSC_LTSC2016 },
new ImageDescriptor { RuntimeVersion = "4.7.2", BuildVersion = "4.7.2", OsVariant = WSC_1803 },
new ImageDescriptor { RuntimeVersion = "4.7.2", BuildVersion = "4.7.2", OsVariant = WSC_LTSC2019 },
new ImageDescriptor { RuntimeVersion = "4.6.2", BuildVersion = "4.8", OsVariant = WSC_LTSC2016 },
new ImageDescriptor { RuntimeVersion = "4.7", BuildVersion = "4.8", OsVariant = WSC_LTSC2016 },
new ImageDescriptor { RuntimeVersion = "4.7.1", BuildVersion = "4.8", OsVariant = WSC_LTSC2016 },
new ImageDescriptor { RuntimeVersion = "4.7.2", BuildVersion = "4.8", OsVariant = WSC_LTSC2019 },
new ImageDescriptor { RuntimeVersion = "4.8", BuildVersion = "4.8", OsVariant = WSC_1803 },
new ImageDescriptor { RuntimeVersion = "4.8", BuildVersion = "4.8", OsVariant = WSC_LTSC2016 },
new ImageDescriptor { RuntimeVersion = "4.8", BuildVersion = "4.8", OsVariant = WSC_LTSC2019 },
Expand Down