Revert "Add support for Windows Server 2019 (#719)"

This reverts commit bdef343.

.vsts-pipelines/phases/build-all.yml

@@ -37,16 +37,6 @@ phases:
       osVersion: nanoserver-1803
       demands: VSTS_OS -equals Windows_Server_2016_Data_Center_RS4
       matrix: $[ dependencies.GenerateMatrices.outputs['buildMatrix.buildMatrixNanoserver1803Amd64'] ]
-  - template: build-windows-amd64.yml
-    parameters:
-      phase: Build_NanoServer1809_amd64
-      imageBuilderImage: ${{ parameters.imageBuilderWindowsImage }}
-      manifest: ${{ parameters.manifest }}
-      repo: ${{ parameters.repo }}
-      osVersion: nanoserver-1809
-      demands:
-        - VSTS_OS -equals Windows_Server_2019_Data_Center_RS5
-      matrix: $[ dependencies.GenerateMatrices.outputs['buildMatrix.buildMatrixNanoserver1809Amd64'] ]
 
   ################################################################################
   # Test Images
@@ -77,16 +67,6 @@ phases:
         - GenerateMatrices
       demands: VSTS_OS -equals Windows_Server_2016_Data_Center_RS4
       matrix: $[ dependencies.GenerateMatrices.outputs['testMatrix.testMatrixNanoserver1803Amd64'] ]
-  - template: test-windows-amd64.yml
-    parameters:
-      phase: Test_NanoServer1809_amd64
-      repo: ${{ parameters.repo }}
-      dependsOn:
-        - Build_NanoServer1809_amd64
-        - GenerateMatrices
-      demands:
-        - VSTS_OS -equals Windows_Server_2019_Data_Center_RS5
-      matrix: $[ dependencies.GenerateMatrices.outputs['testMatrix.testMatrixNanoserver1809Amd64'] ]
 
   ################################################################################
   # Publish Images
@@ -119,15 +99,5 @@ phases:
       osVersion: nanoserver-1803
       demands: VSTS_OS -equals Windows_Server_2016_Data_Center_RS4
       matrix: $[ dependencies.GenerateMatrices.outputs['buildMatrix.buildMatrixNanoserver1803Amd64'] ]
-  - template: copy-images-windows.yml
-    parameters:
-      phase: Copy_Images_NanoServer1809_amd64
-      imageBuilderImage: ${{ parameters.imageBuilderWindowsImage }}
-      manifest: ${{ parameters.manifest }}
-      repo: ${{ parameters.repo }}
-      osVersion: nanoserver-1809
-      demands:
-        - VSTS_OS -equals Windows_Server_2019_Data_Center_RS5
-      matrix: $[ dependencies.GenerateMatrices.outputs['buildMatrix.buildMatrixNanoserver1809Amd64'] ]
 
   - template: publish-finalize.yml

.vsts-pipelines/phases/copy-images-linux.yml

@@ -4,15 +4,14 @@ parameters:
   matrix: {}
 phases:
   - phase: ${{ parameters.phase }}
-    condition: or(eq(variables['singlePhase'], 'publish'), and(eq(variables['singlePhase'], ''), or(succeeded(), and(eq(variables['repo'], 'dotnet-samples'), eq(variables['singlePhase'], ''), succeeded('Build_Linux_amd64'), succeeded('Build_Linux_arm32v7'), succeeded('Build_NanoServerSac2016_amd64'), succeeded('Build_NanoServer1709_amd64'), succeeded('Build_NanoServer1803_amd64'), succeeded('Build_NanoServer1809_amd64')))))
+    condition: or(eq(variables['singlePhase'], 'publish'), and(eq(variables['singlePhase'], ''), or(succeeded(), and(eq(variables['repo'], 'dotnet-samples'), eq(variables['singlePhase'], ''), succeeded('Build_Linux_amd64'), succeeded('Build_Linux_arm32v7'), succeeded('Build_NanoServerSac2016_amd64'), succeeded('Build_NanoServer1709_amd64'), succeeded('Build_NanoServer1803_amd64')))))
     dependsOn:
       - GenerateMatrices
       - Test_Linux_amd64
       - Test_Linux_arm32v7
       - Test_NanoServerSac2016_amd64
       - Test_NanoServer1709_amd64
       - Test_NanoServer1803_amd64
-      - Test_NanoServer1809_amd64
     queue:
       name: DotNet-Build
       demands: agent.os -equals linux

.vsts-pipelines/phases/copy-images-windows.yml

@@ -5,15 +5,14 @@ parameters:
   matrix: {}
 phases:
   - phase: ${{ parameters.phase }}
-    condition: or(eq(variables['singlePhase'], 'publish'), and(eq(variables['singlePhase'], ''), or(succeeded(), and(eq(variables['repo'], 'dotnet-samples'), eq(variables['singlePhase'], ''), succeeded('Build_Linux_amd64'), succeeded('Build_Linux_arm32v7'), succeeded('Build_NanoServerSac2016_amd64'), succeeded('Build_NanoServer1709_amd64'), succeeded('Build_NanoServer1803_amd64'), succeeded('Build_NanoServer1809_amd64')))))
+    condition: or(eq(variables['singlePhase'], 'publish'), and(eq(variables['singlePhase'], ''), or(succeeded(), and(eq(variables['repo'], 'dotnet-samples'), eq(variables['singlePhase'], ''), succeeded('Build_Linux_amd64'), succeeded('Build_Linux_arm32v7'), succeeded('Build_NanoServerSac2016_amd64'), succeeded('Build_NanoServer1709_amd64'), succeeded('Build_NanoServer1803_amd64')))))
     dependsOn:
       - GenerateMatrices
       - Test_Linux_amd64
       - Test_Linux_arm32v7
       - Test_NanoServerSac2016_amd64
       - Test_NanoServer1709_amd64
       - Test_NanoServer1803_amd64
-      - Test_NanoServer1809_amd64
     queue:
       name: DotNetCore-Infra
       demands: ${{ parameters.demands }}

.vsts-pipelines/phases/publish-finalize.yml

@@ -1,13 +1,12 @@
 phases:
   - phase: Publish_Finalize
-    condition: and(succeeded('Copy_Images_Linux_amd64'), succeeded('Copy_Images_Linux_arm32v7'), succeeded('Copy_Images_NanoServerSac2016_amd64'), succeeded('Copy_Images_NanoServer1709_amd64'), succeeded('Copy_Images_NanoServer1803_amd64'), succeeded('Copy_Images_NanoServer1809_amd64'))
+    condition: and(succeeded('Copy_Images_Linux_amd64'), succeeded('Copy_Images_Linux_arm32v7'), succeeded('Copy_Images_NanoServerSac2016_amd64'), succeeded('Copy_Images_NanoServer1709_amd64'), succeeded('Copy_Images_NanoServer1803_amd64'))
     dependsOn:
       - Copy_Images_Linux_amd64
       - Copy_Images_Linux_arm32v7
       - Copy_Images_NanoServerSac2016_amd64
       - Copy_Images_NanoServer1709_amd64
       - Copy_Images_NanoServer1803_amd64
-      - Copy_Images_NanoServer1809_amd64
     queue:
       name: DotNet-Build
       demands: agent.os -equals linux

README.md

@@ -55,16 +55,6 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn
 
 See the [complete set of tags](https://github.com/dotnet/dotnet-docker/blob/master/TAGS.md).
 
-# Windows Server, version 1809 amd64 tags
-
-- [`2.1.403-sdk-nanoserver-1809`, `2.1-sdk-nanoserver-1809`, `2.1.403-sdk`, `2.1-sdk`, `sdk`, `latest` (*2.1/sdk/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1809/amd64/Dockerfile)
-- [`2.1.5-aspnetcore-runtime-nanoserver-1809`, `2.1-aspnetcore-runtime-nanoserver-1809`, `2.1.5-aspnetcore-runtime`, `2.1-aspnetcore-runtime`, `aspnetcore-runtime` (*2.1/aspnetcore-runtime/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnetcore-runtime/nanoserver-1809/amd64/Dockerfile)
-- [`2.1.5-runtime-nanoserver-1809`, `2.1-runtime-nanoserver-1809`, `2.1.5-runtime`, `2.1-runtime`, `runtime` (*2.1/runtime/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1809/amd64/Dockerfile)
-
-**.NET Core 2.2 Preview tags**
-
-See the [complete set of tags](https://github.com/dotnet/dotnet-docker/blob/master/TAGS.md).
-
 # Windows Server, version 1803 amd64 tags
 
 - [`2.1.403-sdk-nanoserver-1803`, `2.1-sdk-nanoserver-1803`, `2.1.403-sdk`, `2.1-sdk`, `sdk`, `latest` (*2.1/sdk/nanoserver-1803/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1803/amd64/Dockerfile)

TAGS.md

@@ -34,18 +34,6 @@
 - [`2.2.0-preview2-runtime-deps-alpine3.8`, `2.2-runtime-deps-alpine3.8`, `2.2.0-preview2-runtime-deps-alpine`, `2.2-runtime-deps-alpine` (*2.2/runtime-deps/alpine3.8/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime-deps/alpine3.8/amd64/Dockerfile)
 - [`2.2.0-preview2-runtime-deps-bionic`, `2.2-runtime-deps-bionic` (*2.1/runtime-deps/bionic/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/amd64/Dockerfile)
 
-# Windows Server, version 1809 amd64 tags
-
-- [`2.1.403-sdk-nanoserver-1809`, `2.1-sdk-nanoserver-1809`, `2.1.403-sdk`, `2.1-sdk`, `sdk`, `latest` (*2.1/sdk/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1809/amd64/Dockerfile)
-- [`2.1.5-aspnetcore-runtime-nanoserver-1809`, `2.1-aspnetcore-runtime-nanoserver-1809`, `2.1.5-aspnetcore-runtime`, `2.1-aspnetcore-runtime`, `aspnetcore-runtime` (*2.1/aspnetcore-runtime/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnetcore-runtime/nanoserver-1809/amd64/Dockerfile)
-- [`2.1.5-runtime-nanoserver-1809`, `2.1-runtime-nanoserver-1809`, `2.1.5-runtime`, `2.1-runtime`, `runtime` (*2.1/runtime/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1809/amd64/Dockerfile)
-
-**.NET Core 2.2 Preview 3 tags**
-
-- [`2.2.100-preview3-sdk-nanoserver-1809`, `2.2-sdk-nanoserver-1809`, `2.2.100-preview2-sdk`, `2.2-sdk` (*2.2/sdk/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/nanoserver-1809/amd64/Dockerfile)
-- [`2.2.0-preview3-aspnetcore-runtime-nanoserver-1809`, `2.2-aspnetcore-runtime-nanoserver-1809`, `2.2.0-preview2-aspnetcore-runtime`, `2.2-aspnetcore-runtime` (*2.2/aspnetcore-runtime/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnetcore-runtime/nanoserver-1809/amd64/Dockerfile)
-- [`2.2.0-preview3-runtime-nanoserver-1809`, `2.2-runtime-nanoserver-1809`, `2.2.0-preview2-runtime`, `2.2-runtime` (*2.2/runtime/nanoserver-1809/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1809/amd64/Dockerfile)
-
 # Windows Server, version 1803 amd64 tags
 
 - [`2.1.403-sdk-nanoserver-1803`, `2.1-sdk-nanoserver-1803`, `2.1.403-sdk`, `2.1-sdk`, `sdk`, `latest` (*2.1/sdk/nanoserver-1803/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1803/amd64/Dockerfile)